diff --git a/templates/PhotoPage.php b/templates/PhotoPage.php
index 2decf31c..3f34e3df 100644
--- a/templates/PhotoPage.php
+++ b/templates/PhotoPage.php
@@ -24,8 +24,12 @@ class PhotoPage extends Template
 
 		echo '
 				<div class="row mt-5">
-					<div class="col-lg-8">
-						<div id="sub_photo" class="content-box">
+					<div class="col-lg-9">
+						<div id="sub_photo" class="content-box">';
+
+		$this->userActions();
+
+		echo '
 							<h2 class="entry-title">', $this->photo->getTitle(), '</h2>';
 
 		$this->taggedPeople();
@@ -34,10 +38,9 @@ class PhotoPage extends Template
 		echo '
 						</div>
 					</div>
-					<div class="col-lg-4">';
+					<div class="col-lg-3">';
 
 		$this->photoMeta();
-		$this->userActions();
 
 		echo '
 					</div>
@@ -218,13 +221,13 @@ class PhotoPage extends Template
 			return;
 
 		echo '
-				<div id="user_actions_box" class="content-box">
-					<h3>Actions</h3>
-					<a class="btn btn-primary" href="', $this->photo->getEditUrl(), '">Edit photo</a>
+				<div class="float-end">
+					<a class="btn btn-primary" href="', $this->photo->getEditUrl(), '">
+						<i class="bi bi-pencil"></i> Edit</a>
 					<a class="btn btn-danger" href="', $this->photo->getDeleteUrl(), '&',
 						Session::getSessionTokenKey(), '=', Session::getSessionToken(),
 						'" onclick="return confirm(\'Are you sure you want to delete this photo?\');"',
-						'">Delete photo</a>
+						'"><i class="bi bi-pencil"></i> Delete</a></a>
 				</div>';
 	}
 }