diff --git a/wp-admin/css/theme-editor.css b/wp-admin/css/theme-editor.css
index e4dccdf17d..331a0f4076 100644
--- a/wp-admin/css/theme-editor.css
+++ b/wp-admin/css/theme-editor.css
@@ -1,5 +1,10 @@
 #template textarea {
-	font: small 'Courier New', Courier, monospace;
+	font-family: 'Courier New', Courier, monospace;
+	font-size: 12px;
+	width: 97%;
+}
+
+#template p {
 	width: 97%;
 }
 
diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index 7d375f1ad7..bb0c94b13b 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -152,8 +152,10 @@ if ($allowed_files) :
 		 <input type="hidden" name="file" value="<?php echo $file ?>" />
 		 <input type="hidden" name="theme" value="<?php echo $theme ?>" />
 		 </div>
+		
+		<div>
 <?php if ( is_writeable($real_file) ) : ?>
-	<p class="submit">
+			<p class="submit">
 <?php
 	echo "<input type='submit' name='submit' value='	" . __('Update File &raquo;') . "' tabindex='2' />";
 ?>
@@ -161,6 +163,7 @@ if ($allowed_files) :
 <?php else : ?>
 <p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="http://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
 <?php endif; ?>
+		</div>
 	</form>
 	<?php
 	} else {
diff --git a/wp-content/themes/default/rtl.css b/wp-content/themes/default/rtl.css
index daa5bbacf8..9b4e8ffe87 100644
--- a/wp-content/themes/default/rtl.css
+++ b/wp-content/themes/default/rtl.css
@@ -1,78 +1,78 @@
-/* Based on Arabic (RTL) version of Kubrick theme, converted by Serdal (Serdal.com) */
-
-.narrowcolumn, .alignleft, .widecolumn .smallattachment { float: right; }
-.alignright, #commentform #submit { float: left; }
-
-#page, .post, #wp-calendar #prev a { text-align: right; }
-
-body, #commentform p { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
-
-small { font-family: 'Geeza Pro', Tahoma, Arial, Helvetica, Sans-Serif; }
-
-h1, h2, h3 { font-family: 'Al Bayan', 'Traditional Arabic', 'Trebuchet MS', 'Lucida Grande', Verdana, Arial, Sans-Serif; }
-
-#sidebar h2 { font-family: 'Al Bayan', 'Traditional Arabic', 'Lucida Grande', Verdana, Sans-Serif; }
-
-.commentlist li, #commentform input, #commentform textarea { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
-
-#sidebar { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
-
-#wp-calendar caption { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
-
-acronym, abbr, span.caps { letter-spacing: normal; }
-
-#header { margin: 0 1px 0 0; }
-
-.narrowcolumn { padding: 0 45px 20px 0; }
-
-.widecolumn { margin: 5px 150px 0 0; }
-
-.widecolumn .smallattachment { margin: 5px 0px 5px 5px; }
-
-.postmetadata { clear: right; }
-
-img.alignright { margin: 0 7px 2px 0; }
-
-img.alignleft { margin: 0 0 2px 7px; }
-
-.entry ol { padding: 0 35px 0 0; }
-
-#sidebar ul ul, #sidebar ul ol { margin: 5px 10px 0 0; }
-
-#sidebar ul ul ul, #sidebar ul ol { margin: 0 10px 0 0; }
-
-#commentform input { margin: 5px 0 1px 5px; }
-
-.commentlist p { margin: 10px 0 10px 5px; }
-
-html>body .entry li { margin: 7px 10px 8px 0; }
-
-html>body .entry ul {
-	margin-left: auto;
-	margin-right: 0px;
-	padding: 0 30px 0 0;
-}
-
-#sidebar {
-	margin-left: auto;
-	margin-right: 545px;
-}
-
-#wp-calendar #prev a, html>body .entry ul {
-	padding-left: 0;
-	padding-right: 10px;
-}
-
-blockquote {
-	border-left: 0;
-	border-right: 5px solid #ddd;
-	padding-left: 0;
-	padding-right: 20px;
-	margin: 15px 10px 0 30px;
-}
-
-#wp-calendar #next a {
-	padding-right: 0;
-	padding-left: 10px;
-	text-align: left;
-}
+/* Based on Arabic (RTL) version of Kubrick theme, converted by Serdal (Serdal.com) */
+
+.narrowcolumn, .alignleft, .widecolumn .smallattachment { float: right; }
+.alignright, #commentform #submit { float: left; }
+
+#page, .post, #wp-calendar #prev a { text-align: right; }
+
+body, #commentform p { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
+
+small { font-family: 'Geeza Pro', Tahoma, Arial, Helvetica, Sans-Serif; }
+
+h1, h2, h3 { font-family: 'Al Bayan', 'Traditional Arabic', 'Trebuchet MS', 'Lucida Grande', Verdana, Arial, Sans-Serif; }
+
+#sidebar h2 { font-family: 'Al Bayan', 'Traditional Arabic', 'Lucida Grande', Verdana, Sans-Serif; }
+
+.commentlist li, #commentform input, #commentform textarea { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
+
+#sidebar { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
+
+#wp-calendar caption { font-family: 'Geeza Pro', Tahoma, 'Lucida Grande', Verdana, Arial, Sans-Serif; }
+
+acronym, abbr, span.caps { letter-spacing: normal; }
+
+#header { margin: 0 1px 0 0; }
+
+.narrowcolumn { padding: 0 45px 20px 0; }
+
+.widecolumn { margin: 5px 150px 0 0; }
+
+.widecolumn .smallattachment { margin: 5px 0px 5px 5px; }
+
+.postmetadata { clear: right; }
+
+img.alignright { margin: 0 7px 2px 0; }
+
+img.alignleft { margin: 0 0 2px 7px; }
+
+.entry ol { padding: 0 35px 0 0; }
+
+#sidebar ul ul, #sidebar ul ol { margin: 5px 10px 0 0; }
+
+#sidebar ul ul ul, #sidebar ul ol { margin: 0 10px 0 0; }
+
+#commentform input { margin: 5px 0 1px 5px; }
+
+.commentlist p { margin: 10px 0 10px 5px; }
+
+html>body .entry li { margin: 7px 10px 8px 0; }
+
+html>body .entry ul {
+	margin-left: auto;
+	margin-right: 0px;
+	padding: 0 30px 0 0;
+}
+
+#sidebar {
+	margin-left: auto;
+	margin-right: 545px;
+}
+
+#wp-calendar #prev a, html>body .entry ul {
+	padding-left: 0;
+	padding-right: 10px;
+}
+
+blockquote {
+	border-left: 0;
+	border-right: 5px solid #ddd;
+	padding-left: 0;
+	padding-right: 20px;
+	margin: 15px 10px 0 30px;
+}
+
+#wp-calendar #next a {
+	padding-right: 0;
+	padding-left: 10px;
+	text-align: left;
+}