diff --git a/ext/rotate/main.php b/ext/rotate/main.php
index ad194012..79b3199d 100644
--- a/ext/rotate/main.php
+++ b/ext/rotate/main.php
@@ -92,9 +92,6 @@ class RotateImage extends Extension {
 					} catch (ImageRotateException $e) {
 						$this->theme->display_rotate_error($page, "Error Rotating", $e->error);
 					}
-				} else {
-					/* Display options for resizing */
-					$this->theme->display_rotate_page($page, $image_id);
 				}
 			}
 		}
diff --git a/ext/rotate/style.css b/ext/rotate/style.css
deleted file mode 100644
index b9f1003d..00000000
--- a/ext/rotate/style.css
+++ /dev/null
@@ -1,5 +0,0 @@
-form#form_rotate  {
-	float: left;
-    margin: 0;
-    width: 60%;
-}
diff --git a/ext/rotate/theme.php b/ext/rotate/theme.php
index 9ebce039..d29bb172 100644
--- a/ext/rotate/theme.php
+++ b/ext/rotate/theme.php
@@ -10,9 +10,10 @@ class RotateImageTheme extends Themelet {
 		$i_image_id = int_escape($image_id);
 		
 		$html = "
-			".make_form(make_link("rotate"),'POST',false,'rotate_image')."
-				<input type='hidden' name='image_id' value='$i_image_id' />
-				<input type='submit' value='Rotate' id='rotate_image_submit' />
+			".make_form(make_link('rotate/'.$image_id), 'POST')."
+				<input type='hidden' name='image_id' value='$image_id'>
+				<input id='rotate_deg' name='rotate_deg' type='text' placeholder='Rotation degrees'>
+				<input id='rotatebutton' type='submit' value='Rotate'>
 			</form>
 		";
 		
@@ -25,33 +26,5 @@ class RotateImageTheme extends Themelet {
 		$page->add_block(new NavBlock());
 		$page->add_block(new Block($title, $message));
 	}
-	
-	public function display_rotate_page(Page $page, /*int*/ $image_id) {
-		global $config;
-		
-		$default_deg = $config->get_int('rotate_default_deg');
-		
-		$image = Image::by_id($image_id);
-		$thumbnail = $this->build_thumb_html($image, null);
-		
-		$html = "<div style='clear:both;'></div>
-				<p>Rotate Image ID ".$image_id."<br>".$thumbnail."</p>
-				<p>Please note: You will have to refresh the image page, or empty your browser cache.</p>
-				<p>Enter the degrees to rotate the image of, counterclockwise.</p><br>"
-				.make_form(make_link('rotate/'.$image_id), 'POST', $multipart=True,'form_rotate')."
-				<input type='hidden' name='image_id' value='$image_id'>
-				<table id='large_upload_form'>
-					<tr><td>Degrees</td><td colspan='3'><input id='rotate_deg' name='rotate_deg' type='text' value='".$default_deg."'></td></tr>
-					<tr><td colspan='4'><input id='rotatebutton' type='submit' value='Rotate'></td></tr>
-				</table>
-			</form>
-		";
-	
-		$page->set_title("Rotate Image");
-		$page->set_heading("Rotate Image");
-		$page->add_block(new NavBlock());
-		$page->add_block(new Block("Rotate Image", $html, "main", 20));
-	
-	}
 }
 ?>