diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc
index 3257c776..e328c301 100644
--- a/web/lib/pkgfuncs.inc
+++ b/web/lib/pkgfuncs.inc
@@ -465,75 +465,11 @@ function package_details($id=0, $SID="") {
 			echo "    </table>\n";
 			echo "  </div>\n";
 			echo "</div>\n\n";
-			echo "<br />\n\n";
-
 
 			# Actions Bar
 			#
 			if ($SID) {
-                echo "<div class=\"pgbox\">\n";
-                echo "  <div class=\"pgboxtitle\"><span class=\"f3\">".__("Actions")."</span></div>\n";
-                echo "  <div class=\"pgboxbody\">\n";
-                echo "    <form action='packages.php?ID=".$row['ID']."' method='post'>\n";
-				echo "      <input type='hidden' name='IDs[".$row["ID"]."]' value='1'>\n";
-				echo "      <input type='hidden' name='ID' value='".$row["ID"]."'>\n";
-				# Voting Button
-				#
-				$q = "SELECT * FROM PackageVotes WHERE UsersID = ". $uid;
-				$q.= " AND PackageID = ".$row["ID"];
-				if (!mysql_num_rows(db_query($q, $dbh))) {
-					echo "      <input type='submit' class='button' name='do_Vote'";
-					echo " value='".__("Vote")."'>";
-				} else {
-					echo "<input type='submit' class='button' name='do_UnVote'";
-					echo " value='".__("UnVote")."'>";
-				}
-				# Comment Nofify Button
-				#
-				$q = "SELECT * FROM CommentNotify WHERE UserID = ". $uid;
-				$q.= " AND PkgID = ".$row["ID"];
-				if (!mysql_num_rows(db_query($q, $dbh))) {
-					echo "<input type='submit' class='button' name='do_Notify'";
-					echo " value='".__("Notify")."' title='".__("New Comment Notification")."'>";
-				} else {
-					echo "<input type='submit' class='button' name='do_UnNotify'";
-					echo " value='".__("UnNotify")."' title='".__("No New Comment Notification")."'>";
-				}
-
-                if ($row["OutOfDate"] == 0) {
-                    echo "<input type='submit' class='button' name='do_Flag'";
-                    echo " value='".__("Flag Out-of-date")."'>\n";
-                } else {
-                    echo "<input type='submit' class='button' name='do_UnFlag'";
-                    echo " value='".__("UnFlag Out-of-date")."'>\n";
-				}
-					
-                if ($row["MaintainerUID"] == 0) {
-                    echo "<input type='submit' class='button' name='do_Adopt'";
-                    echo " value='".__("Adopt Packages")."'>\n";
-                } else if ($uid == $row["MaintainerUID"] ||
-                        $atype == "Trusted User" || $atype == "Developer") {
-					echo "<input type='submit' class='button' name='do_Disown'";
-					echo " value='".__("Disown Packages")."'>\n";
-				}
-					
-				if ($atype == "Trusted User" || $atype == "Developer") {
-					echo "<input type='submit' class='button' name='do_Delete'";
-					echo " value='".__("Delete Packages")."'>\n";
-				}
-						
-                echo "    </form>\n";
-                echo "<br />\n";
-
-			# Add Comments
-			echo "<form action='pkgedit.php' method='post'>\n";
-			echo "<input type='hidden' name='ID' value='".$row["ID"]."'>\n";
-			echo "<input type='submit' class='button' name='add_Comment' value=\"";
-			echo __("Add Comment")."\">\n";
-			echo "</form>\n";
-                echo "  </div>\n";
-                echo "</div>\n";
-                echo "\n<br />";
+				include('actions_form.php');
 			}
 			
 			# Print Comments
diff --git a/web/template/actions_form.php b/web/template/actions_form.php
new file mode 100644
index 00000000..6299819d
--- /dev/null
+++ b/web/template/actions_form.php
@@ -0,0 +1,60 @@
+<div class="pgbox">
+	<form action="packages.php?ID=<?php echo $row['ID'] ?>" method="post">
+		<input type='hidden' name='IDs[<?php echo $row['ID'] ?>]' value='1'>
+		<input type='hidden' name='ID' value="<?php echo $row['ID'] ?>">
+<?php
+		# Voting Button
+		#
+		$q = "SELECT * FROM PackageVotes WHERE UsersID = ". $uid;
+		$q.= " AND PackageID = ".$row["ID"];
+		if (!mysql_num_rows(db_query($q, $dbh))) {
+			echo "      <input type='submit' class='button' name='do_Vote'";
+			echo " value='".__("Vote")."'> ";
+		} else {
+			echo "<input type='submit' class='button' name='do_UnVote'";
+			echo " value='".__("UnVote")."'> ";
+		}
+
+		# Comment Notify Button
+		#
+		$q = "SELECT * FROM CommentNotify WHERE UserID = ". $uid;
+		$q.= " AND PkgID = ".$row["ID"];
+		if (!mysql_num_rows(db_query($q, $dbh))) {
+			echo "<input type='submit' class='button' name='do_Notify'";
+			echo " value='".__("Notify")."' title='".__("New Comment Notification")."'> ";
+		} else {
+			echo "<input type='submit' class='button' name='do_UnNotify'";
+			echo " value='".__("UnNotify")."' title='".__("No New Comment Notification")."'> ";
+		}
+
+if ($row["OutOfDate"] == 0) {
+    echo "<input type='submit' class='button' name='do_Flag'";
+    echo " value='".__("Flag Out-of-date")."'>\n";
+} else {
+    echo "<input type='submit' class='button' name='do_UnFlag'";
+    echo " value='".__("UnFlag Out-of-date")."'>\n";
+		}
+			
+if ($row["MaintainerUID"] == 0) {
+    echo "<input type='submit' class='button' name='do_Adopt'";
+    echo " value='".__("Adopt Packages")."'>\n";
+} else if ($uid == $row["MaintainerUID"] ||
+	$atype == "Trusted User" || $atype == "Developer") {
+			echo "<input type='submit' class='button' name='do_Disown'";
+			echo " value='".__("Disown Packages")."'>\n";
+		}
+			
+		if ($atype == "Trusted User" || $atype == "Developer") {
+			echo "<input type='submit' class='button' name='do_Delete'";
+			echo " value='".__("Delete Packages")."'>\n";
+		}
+?>
+				
+	</form>
+<br />
+
+	<form action='pkgedit.php' method='post'>
+	<input type='hidden' name='ID' value="<?php echo $row['ID'] ?>" />
+	<input type='submit' class='button' name='add_Comment' value="<?php echo __('Add Comment') ?>" />
+	</form>
+</div>