Index: app/views/admin/pages/_form.rhtml
===================================================================
--- app/views/admin/pages/_form.rhtml	(revision 1346)
+++ app/views/admin/pages/_form.rhtml	(working copy)
@@ -1,20 +1,34 @@
 <%= error_messages_for 'page' %>
 <!--[form:pages]-->
-<p>
-  <label for="page_name">Location:</label><br />
-  /pages/ <%= text_field 'page', 'name', :size => 16  %>
-</p>
-<p>
-  <label for="page_title">Title:</label><br />
-  <%= text_field 'page', 'title', :size => 20  %>
-</p>
-<p>
-  <label for="page_body">Content:</label><br />
-  <%= text_area 'page', 'body', :rows => 25, :style => 'width: 48%;'  %> 
-  <br/><%= markup_help_popup @page.text_filter, "Markup Help" %>
-</p>
+<fieldset class="set">
+  <legend>Page Body</legend>
+  <ul>
+    <li>
+      <label class="float" style="width: 120px" for="page_name">Page location:</label>
+      <%= text_field 'page', 'name', :size => 25  %>
+      <span class="float" style="margin-left: 132px">You will access this page on your blog at <%= this_blog.base_url %>/page-location</span>
+    </li>
+    <li>
+      <label class="float" style="width: 120px" for="page_title">Title:</label>
+      <%= text_field 'page', 'title', :size => 25  %>
+    </li>
+    <li>
+      <label for="page_body">Content:</label><br />
+      <%= text_area 'page', 'body', :rows => 25, :style => 'width: 48%; display: block;'  %>
+      <%= markup_help_popup @page.text_filter, "Markup Help &raquo;" %>
+    </li>
+  </ul>
+</fieldset>
 
-<label for="page_text_filter">Textfilter: </label><%= select 'page', 'text_filter', text_filter_options %><br/>
+<fieldset class="set">
+  <legend>Advanced Options</legend>
+  <ul>
+    <li>
+      <label class="float" style="width: 120px" for="page_text_filter">Textfilter: </label>
+      <%= select 'page', 'text_filter', text_filter_options %>
+    </li>
+  </ul>
+</fieldset>
 <br clear="all"/>
 
 <!--[eoform:pages]-->
Index: app/views/admin/pages/new.rhtml
===================================================================
--- app/views/admin/pages/new.rhtml	(revision 1346)
+++ app/views/admin/pages/new.rhtml	(working copy)
@@ -1,4 +1,5 @@
-  <% @page_heading = 'Pages' %>
+  <% @page_heading = 'New Page' %>
 
-  <h3>Creating page</h3>
+  <div class="admin">
   <%= render :partial => "admin/shared/edit", :locals => { :form_type => "page", :form_action => { :action => "new" } } %>
+  </div>
\ No newline at end of file
Index: app/views/admin/shared/_edit.rhtml
===================================================================
--- app/views/admin/shared/_edit.rhtml	(revision 1346)
+++ app/views/admin/shared/_edit.rhtml	(working copy)
@@ -1,13 +1,13 @@
 <% form_tag(form_action, :id => "#{form_type}_form", :enctype => "multipart/form-data") do %>
 
-<div class="form">
+<div class="admin">
   <!-- LIVE PREVIEW -->
   <iframe id="preview" class="post" style="display:none;"></iframe>
   <!-- /LIVE PREVIEW -->
   <%= render :partial => "form" %>
 </div>
 
-<div id="operations">
+<div id="operations"  class="tasks r">
   <%= save("Save this #{form_type}") %> or <%= cancel %>
 </div>
 
Index: app/views/admin/content/list.rhtml
===================================================================
--- app/views/admin/content/list.rhtml	(revision 1346)
+++ app/views/admin/content/list.rhtml	(working copy)
@@ -1,17 +1,8 @@
   <% @page_heading = 'Articles' %>
 
   <% content_for('tasks') do %>
-    <%= task_quickpost('Quick Post') %>
-    <%= task_new 'Create new article' %>
-    <%= task_quicknav('Navigate') %>
+    <%= task_new 'New Article' %>
   <% end %> 
-  <div id="quick-navigate" style="display:none;position:absolute;">
-    <%= render :partial => 'admin/content/pages', :object => @articles_pages -%>
-  </div>
-
-  <div id="quick-post" style="display:none;position:absolute;">
-    <%= render :partial => "quick_post" %>
-  </div>
   <div class="list" id="articles">	
     <%= render :partial => 'articles' %>
   </div>                      
Index: app/views/admin/content/_form.rhtml
===================================================================
--- app/views/admin/content/_form.rhtml	(revision 1346)
+++ app/views/admin/content/_form.rhtml	(working copy)
@@ -1,55 +1,77 @@
 <%= error_messages_for 'article' %>
 <!--[form:articles]-->
-<p>
-  <label for="article_title">Title:</label><br />
-  <%= text_field 'article', 'title'  %>
-  (<%= link_to_function "&raquo; edit permalink",
-          update_page { |page| page.visual_effect(:toggle_blind, "permalink", :duration => 0.5) } %>)<br/>
-</p>
-<p id="permalink" style="display: none">
-  <label for="article_permalink">Permalink:</label><br />
-  <%= text_field 'article', 'permalink'  %>
-</p>
-<p>
-  <label for="article_body">Body:</label><br />
-  <%= text_area 'article', 'body', :rows => 25, :style => 'width: 48%;'  %>
-  <br/><%= markup_help_popup @article.text_filter, "Markup Help" %>
-</p>
-<p>
-  <label for="categories">Categories:</label><br />
-  <select id="categories" name="categories[]" multiple="multiple" size="10" style="width:250px;">
-  <%= options_from_collection_for_select(@categories, "id", "name", @selected) %>
-  </select>
-</p>
-<p>
-  <label for="article_keywords">Tags:</label><br/>
-  <%= text_field 'article', 'keywords'  %>
-</p>
-<p>
-<%= link_to_function "Toggle Extended Content (+/-)",
-      update_page { |page| page.visual_effect(:toggle_blind, "extended", :duration => 0.5) } %>
-  <div id="extended"<%- if @article.extended.blank? -%> style="display:none;"<%- end -%>>
-  <label for="article_extended">Extended:</label><br />
-  <%= text_area 'article', 'extended', :rows => 30, :style => 'width: 48%;'  %>
-  </div>
-</p>
 
-<%= link_to_function "Toggle Advanced Options (+/-)",
-      update_page { |page| page.visual_effect(:toggle_blind, "advanced", :duration => 0.5) } %>
-<div id="advanced" style="display:none;">
-<label for="article_allow_comments">Allow comments: </label><%= check_box 'article', 'allow_comments'  %><br />
-<label for="article_allow_pings">Allow trackbacks: </label><%= check_box 'article', 'allow_pings'  %><br />
-<label for="article_published">Published:</label><%= check_box 'article', 'published'  %><br />
-<label for="article_text_filter">Textfilter: </label><%= select 'article', 'text_filter', text_filter_options %><br />
-<label for="article_published_at">Publish at:</label><%= datetime_select 'article', 'published_at', :include_blank => true  %><br />
-</div>
-<br clear="all"/>
+<fieldset class="set">
+  <legend>Article Body</legend>
+  <ul>
+    <li>
+      <label class="float" style="width: 90px; text-align: left" for="article_title">Title:</label>
+      <%= text_field 'article', 'title'  %>
+      <span class="float" style="margin-left: 107px;">
+        <%= link_to_function "Edit permalink &raquo;",
+          update_page { |page| page.visual_effect(:toggle_blind, "permalink", :duration => 0.5) } %>
+      </span>
+    </li>
+    <li id="permalink" style="display: none;">
+      <label class="float" style="width: 90px; text-align: left" for="article_permalink">Permalink:</label>
+      <%= text_field 'article', 'permalink' %>
+    </li>
+    <li>
+      <label for="article_body">Body:</label>
+      <%= text_area 'article', 'body', :rows => 25, :style => 'width: 48%; display: block'  %>
+      <%= markup_help_popup @article.text_filter, "Markup Help &raquo;" %>	
+    </li>
+    <li>
+      <%= link_to_function "Toggle Extended Content (+/-)",
+        update_page { |page| page.visual_effect(:toggle_blind, "extended", :duration => 0.5) } %>
+    </li>
+    <li id="extended"<%- if @article.extended.blank? -%> style="display:none;"<%- end -%>>
+      <label for="article_extended">Extended Content:</label>
+      <%= text_area 'article', 'extended', :rows => 30, :style => 'width: 48%; display: block;'  %>
+    </li>
+</ul>
+<p class="r"><%= save("Save This Article") %> or <%= cancel %></p>
+</fieldset>
 
-<p>
-<%= link_to_function "Attachments (+/-)", update_page { |page| page.visual_effect(:toggle_blind, "attachments", :duration => 0.5) } %>
-<div id="attachments" style="display:none;">
+<fieldset class="set">
+  <legend>Article Options</legend>
+  <ul>
+    <li>
+      <label class="float" for="categories">Categories:</label>
+      <select id="categories" name="categories[]" multiple="multiple" size="10" style="width:250px;">
+        <%= options_from_collection_for_select(@categories, "id", "name", @selected) %>
+      </select>
+    </li>
+	<li>
+      <label class="float" for="article_keywords">Tags:</label>
+      <%= text_field 'article', 'keywords'  %>
+	</li>
+  </ul>
+</fieldset>
+
+<fieldset class="set">
+  <legend>Advanced Options</legend>
+  <ul>
+    <li class="checkbox">
+      <label class="float" for="article_allow_comments">Allow comments: </label><%= check_box 'article', 'allow_comments'  %>
+    </li>
+    <li class="checkbox">
+      <label class="float" for="article_allow_pings">Allow trackbacks: </label><%= check_box 'article', 'allow_pings'  %>
+    </li>
+    <li class="checkbox">
+      <label class="float" for="article_published">Published:</label><%= check_box 'article', 'published'  %>
+    </li>
+    <li>
+      <label class="float" for="article_text_filter">Textfilter: </label><%= select 'article', 'text_filter', text_filter_options %>
+    </li>
+    <li>
+      <label class="float" for="article_published_at">Publish at:</label><%= datetime_select 'article', 'published_at', :include_blank => true  %>
+    </li>
+  </ul>
+</fieldset>
+
+<fieldset class="set">
+  <legend>Attachments</legend>
   <%= render :partial => 'admin/content/attachment', :locals => { :attachment_num => 1, :hidden => false } -%>
-</div>
-</p>
-
+</fieldset>
 <!--[eoform:articles]-->
Index: app/views/admin/content/_articles.rhtml
===================================================================
--- app/views/admin/content/_articles.rhtml	(revision 1346)
+++ app/views/admin/content/_articles.rhtml	(working copy)
@@ -1,18 +1,20 @@
 <table cellspacing="1" cellpadding="0">
 <tr>
-  <th>Post title</th>
-  <th>Posted</th>
+  <th>Post Title</th>
+  <th>Posted at</th>
   <th>Comments</th>
   <th>Trackbacks</th>
+  <th>Published</th>
   <th>Edit</th>
   <th>Delete</th>
 </tr>
 <% for article in @articles %>
 <tr <%= alternate_class %>>
-  <td><%= (article.published?) ? image_tag('checked.gif') : image_tag('x-ed.gif') %> <%= link_to h(article.title), {:action => "show", :id => article.id} %> <%= link_to_permalink(article,image_tag('go.png')) %> </td>
+  <td><%= link_to h(article.title), {:action => "show", :id => article.id} %> <%= link_to_permalink(article,image_tag('go.png')) %> </td>
   <td><%= time_delta_from_now_in_words article.published_at %></td>
   <td><%= link_to pluralize(article.comments.size, 'comment'), :controller => '/admin/comments', :article_id => article, :action => 'list' %></td>
   <td><%= link_to pluralize(article.trackbacks.size, 'trackback'), :controller => '/admin/trackbacks', :article_id => article, :action => 'list' %></td>
+  <td><%= (article.published?) ? image_tag('checked.gif') : image_tag('x-ed.gif') %></td>
   <td class="operation"><%= link_to_edit article %></td>
   <td class="operation"><%= link_to_destroy article %></td>
 </tr>
Index: app/views/admin/content/edit.rhtml
===================================================================
--- app/views/admin/content/edit.rhtml	(revision 1346)
+++ app/views/admin/content/edit.rhtml	(working copy)
@@ -5,5 +5,4 @@
     <li><%= link_to 'View article on your blog', @article.permalink_url %></li>
   <% end %>
 
-  <h3>Editing article</h3>
   <%= render :partial => "admin/shared/edit", :locals => { :form_type => "article", :form_action => { :action => "edit", :id => @article } } %>
Index: app/views/admin/content/_attachment.rhtml
===================================================================
--- app/views/admin/content/_attachment.rhtml	(revision 1346)
+++ app/views/admin/content/_attachment.rhtml	(working copy)
@@ -9,7 +9,7 @@
   <br />
 </div>
 <div id="attachment_add_<%= attachment_num.succ %>">
-  <%= link_to_remote 'Add Another Attachment',
+  <%= link_to_remote 'Add Another Attachment &raquo;',
     :url => { :action => "attachment_box_add", :id => attachment_num.succ },
     :asynchronus => false -%>
 </div>
\ No newline at end of file
Index: app/views/admin/content/new.rhtml
===================================================================
--- app/views/admin/content/new.rhtml	(revision 1346)
+++ app/views/admin/content/new.rhtml	(working copy)
@@ -1,4 +1,3 @@
-  <% @page_heading = 'Articles' %>
+  <% @page_heading = 'New Article' %>
 
-  <h3>Creating article</h3>
   <%= render :partial => "admin/shared/edit", :locals => { :form_type => "article", :form_action => { :action => "new" } } %>
Index: app/views/admin/general/index.rhtml
===================================================================
--- app/views/admin/general/index.rhtml	(revision 1346)
+++ app/views/admin/general/index.rhtml	(working copy)
@@ -17,7 +17,7 @@
     <p style="clear:both;"></p>
   </div>
 
-<div id="settings">
+<div class="admin">
 	<fieldset id="gensettings" class="set" style="margin-top:10px;">
 		<legend>General settings</legend>
 
@@ -256,7 +256,7 @@
 		</ul>
 	</fieldset>
 
-	<div id="operations" class="tasks">
+	<div id="operations" class="tasks r">
     <%= save("Save Settings") %>
   </div>
 </div>
Index: public/stylesheets/administration.css
===================================================================
--- public/stylesheets/administration.css	(revision 1346)
+++ public/stylesheets/administration.css	(working copy)
@@ -334,32 +334,32 @@
   /* Nothing here */
 }
 
-#settings legend {
+.admin legend {
   font-size: 130%;
   text-transform: capitalize;
 }
 
-#settings ul {
+.admin ul {
   margin: 0;
   padding: 0;
 }
 
-#settings li {
+.admin li {
   list-style: none;
   padding: 5px;
   margin: 0;
   clear: both;
 }
 
-#settings li p {
+.admin li p {
   line-height: 1.6em;
 }
 
-#settings li.checkbox {
+.admin li.checkbox {
   line-height: 1.4em;
 }
 
-#settings label.float {
+.admin label.float {
   display: block;
   float: left;
   width: 190px;
@@ -369,11 +369,11 @@
   text-align: right;
 }
 
-#settings input.float {
+.admin input.float {
   width: auto;
 }
 
-#settings span.float {
+.admin span.float {
   margin-left: 202px;
   padding: 0;
   display: block;