diff --git a/contrib/rating/theme.php b/contrib/rating/theme.php
index 24a460fa..1ce3b30f 100644
--- a/contrib/rating/theme.php
+++ b/contrib/rating/theme.php
@@ -7,10 +7,14 @@ class RatingsTheme extends Themelet {
 		$q_checked = $rating == 'q' ? " checked" : "";
 		$e_checked = $rating == 'e' ? " checked" : "";
 		$html = "
-			<input type='hidden' name='image_id' value='$i_image_id' />
-			<input type='radio' name='rating' value='s' id='s'$s_checked><label for='s'>Safe</label>
-			<input type='radio' name='rating' value='q' id='q'$q_checked><label for='q'>Questionable</label>
-			<input type='radio' name='rating' value='e' id='e'$e_checked><label for='e'>Explicit</label>
+			<tr>
+				<td>Rating</td>
+				<td>
+					<input type='radio' name='rating' value='s' id='s'$s_checked><label for='s'>Safe</label>
+					<input type='radio' name='rating' value='q' id='q'$q_checked><label for='q'>Questionable</label>
+					<input type='radio' name='rating' value='e' id='e'$e_checked><label for='e'>Explicit</label>
+				</td>
+			</tr>
 		";
 		return $html;
 	}
diff --git a/ext/tag_edit/theme.php b/ext/tag_edit/theme.php
index 1725048d..2e32c426 100644
--- a/ext/tag_edit/theme.php
+++ b/ext/tag_edit/theme.php
@@ -34,10 +34,8 @@ class TagEditTheme extends Themelet {
 			}
 
 			$html .= "
-				<table style='width: 500px;'>
 				<tr><td width='50px'>Tags</td><td width='300px'><input type='text' name='tag_edit__tags' value='$h_tags'></td></tr>
 				$source_edit
-				</table>
 			";
 		}
 
diff --git a/ext/view/theme.php b/ext/view/theme.php
index 3b657b99..53cbe9bb 100644
--- a/ext/view/theme.php
+++ b/ext/view/theme.php
@@ -93,12 +93,14 @@ class ViewTheme extends Themelet {
 				<form action='".make_link("post/set")."' method='POST'>
 					<input type='hidden' name='image_id' value='{$image->id}'>
 					<input type='hidden' name='query' value='$h_query'>
+					<table style='width: 500px;'>
 		";
 		foreach($editor_parts as $part) {
 			$html .= $part;
 		}
 		$html .= "
-					<br><input type='submit' value='Set'>
+						<tr><td colspan='2'><input type='submit' value='Set'></td></tr>
+					</table>
 				</form>
 				<br>
 			</div>