diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index d910501ae..9e07e1b73 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -1,29 +1,3 @@
-#zeitgeist {
-	width: 27%;
-	float: right;
-	font-size: 90%;
-	background-color: #eee;
-	padding: 1em;
-	border: 1px solid #69c;
-	margin-left: 1em;
-}
-
-#zeitgeist h2 {
-	border-bottom: none;
-}
-#zeitgeist ul {
-	margin: 0 0 .3em .6em;
-	padding: 0 0 0 .6em;
-}
-#zeitgeist li, #zeitgeist p {
-	margin: .2em 0;
-}
-#zeitgeist h3 {
-	border-top: 1px solid #ccc;
-	font-size: 16px;
-	margin: .5em 0;
-}
-
 * html #poststuff {
 	height: 100%; /* kill peekaboo bug in IE */
 }
@@ -73,8 +47,8 @@ body, td {
 
 fieldset {
 	border: 1px solid #ddd;
-	padding: 3px;
 	-moz-border-radius: 5px;
+	padding: 3px;
 }
 
 fieldset label.selectit {
@@ -92,10 +66,6 @@ fieldset legend {
 	padding: .1em .3em;
 }
 
-fieldset legend a {
-	border-bottom: none;
-}
-
 fieldset span.cat-nest {
 	display: block;
 	margin-left: 10px;
@@ -215,7 +185,7 @@ textarea, input, select {
 	border-top-color: #999;
 }
 
-.submit, #quicktags, .editform th, #postcustomsubmit {
+.submit, #quicktags, .editform th, #postcustomsubmit, #login form {
 	text-align: right;
 }
 
@@ -305,8 +275,8 @@ textarea, input, select {
 #adminmenu2 a {
 	border: none;
 	color: #fff;
-	padding: 3px 5px 4px;
 	font-size: 12px;
+	padding: 3px 5px 4px;
 }
 
 #adminmenu2 a:hover {
@@ -365,72 +335,49 @@ textarea, input, select {
 #login {
 	background: #fff;
 	border: 2px solid #a2a2a2;
-	width: 25em;
 	margin: 5em auto;
 	padding: 1.5em;
+	width: 25em;
 }
 
-#login form {
-	text-align: right;
-}
 #login #login_error {
 	background: #c00;
-	color: #fff;
-	padding: .5em;
 	border: 1px solid #a40000;
-	text-align: center;
-	font-weight: bold;
+	color: #fff;
 	font-size: 16px;
+	font-weight: bold;
+	padding: .5em;
+	text-align: center;
 }
+
 #login h1 {
 	background: url(../wp-images/wp-small.png) no-repeat;
 	margin-top: 0;
 }
+
 #login h1 a {
 	display: block;
 	text-indent: -1000px;
 }
 
-#login ul {
-	list-style: none;
-	margin: 0;
-	padding: 0;
-	
-}
-#login ul li {
-	display: inline;
-	text-align: center;
-	margin-left: 1.4em;
-}
-
 #login input {
 	padding: 3px;
 }
 
-#metainfo, #postdiv, #postexcerpt {
-	clear: both;
-}
-
-#template div {
-	margin-right: 190px;
-}
-
-#templateside {
-	width: 170px;
-	float: right;
-}
-#templateside h3 {
-	margin: 0;
-}
-#templateside ol, #templateside ul {
+#login ul {
 	list-style: none;
-	margin: .5em;
+	margin: 0;
 	padding: 0;
 }
-#template textarea {
-	font-family: 'Courier New', Courier, monospace;
-	font-size: small;
-	width: 99%;
+
+#login ul li {
+	display: inline;
+	margin-left: 1.4em;
+	text-align: center;
+}
+
+#metainfo, #postdiv, #postexcerpt {
+	clear: both;
 }
 
 #postcustom {
@@ -444,10 +391,6 @@ textarea, input, select {
 	width: 5em;
 }
 
-#postcustom p {
-	margin: 0;
-}
-
 #postcustom table {
 	border: 1px solid #ccc;
 	margin: .5em;
@@ -496,6 +439,30 @@ textarea, input, select {
 	height: 4em;
 }
 
+#template div {
+	margin-right: 190px;
+}
+
+#template textarea {
+	font: small 'Courier New', Courier, monospace;
+	width: 99%;
+}
+
+#templateside {
+	float: right;
+	width: 170px;
+}
+
+#templateside h3, #postcustom p {
+	margin: 0;
+}
+
+#templateside ol, #templateside ul {
+	list-style: none;
+	margin: .5em;
+	padding: 0;
+}
+
 #titlediv, #commentstatusdiv, #postpassworddiv, #namediv, #uridiv, #emaildiv, #pageparent {
 	float: left;
 	height: 6em;
@@ -510,11 +477,42 @@ textarea, input, select {
 #wphead h1 {
 	font-size: 2.5em;
 	font-weight: normal;
-	margin: 0;
 	letter-spacing: -.05em;
+	margin: 0;
 }
 
 #wphead h1 span {
 	font-size: .4em;
 	letter-spacing: 0;
 }
+
+#zeitgeist {
+	background: #eee;
+	border: 1px solid #69c;
+	float: right;
+	font-size: 90%;
+	margin-bottom: .5em;
+	margin-left: 1em;
+	margin-top: .5em;
+	padding: 1em;
+	width: 27%;
+}
+
+#zeitgeist h2, fieldset legend a {
+	border-bottom: none;
+}
+
+#zeitgeist h3 {
+	border-bottom: 1px solid #ccc;
+	font-size: 16px;
+	margin: 1em 0;
+}
+
+#zeitgeist li, #zeitgeist p {
+	margin: .2em 0;
+}
+
+#zeitgeist ul {
+	margin: 0 0 .3em .6em;
+	padding: 0 0 0 .6em;
+}