diff --git a/public/designs/templates/default/stylesheets/style.css b/public/designs/templates/default/stylesheets/style.css
index 3199666..e56f710 100644
--- a/public/designs/templates/default/stylesheets/style.css
+++ b/public/designs/templates/default/stylesheets/style.css
@@ -42,9 +42,10 @@ height: 135px;
 
 #boxes {
   position: relative;
-  width: 800px;
+  width: 760px;
   left: 50%;
   margin-left: -400px;
+  padding: 1em;
 }
 
 #box_3 {
@@ -135,3 +136,34 @@ height: 135px;
   color: #ffffff;
 }
 
+div#notice {
+  z-index: 10000;
+  position: absolute;
+  top: 100px;
+  left: 50%;
+  margin-left: -200px;
+  width: 400px;
+  border: 1px solid black;
+  background: #efefef;
+  padding: 0.5em;
+}
+
+div#notice .button {
+  text-align: center;
+  margin-top: 1em;
+  margin-bottom: 0.25em;
+}
+  
+div#notice .button a {
+  border: 1px solid gray;
+  background: #ddd;
+  color: black;
+  padding: 4px;
+  padding-left: 28px;
+  background-image: url(../../../icons/default/cancel.png);
+  background-position: top left;
+  background-repeat: no-repeat;
+}
+div#notice .button a:hover {
+  background-color: #ffd;
+}
diff --git a/public/javascripts/comatose_admin.js b/public/javascripts/comatose_admin.js
index 90d267e..00dbec8 100644
--- a/public/javascripts/comatose_admin.js
+++ b/public/javascripts/comatose_admin.js
@@ -66,15 +66,15 @@ var ComatoseList = {
     }
   },
   
-  toggle_reorder: function(node, anc, id) {
+  toggle_reorder: function(node, anc, id, reorder_text, finished_text) {
     if( $(node).hasClassName('do-reorder') ) {
       $(node).removeClassName( 'do-reorder' );
       $(anc).removeClassName('reordering');
-      $(anc).innerHTML = "reorder children";
+      $(anc).innerHTML = reorder_text;
     } else {
       $(node).addClassName( 'do-reorder' );
       $(anc).addClassName('reordering');
-      $(anc).innerHTML = "finished reordering";
+      $(anc).innerHTML = finished_text;
       // Make sure the children are visible...
       ComatoseList.expand_node(id);
     }
@@ -149,8 +149,8 @@ var ComatoseEditForm = {
     this.last_title = slug.value;
   },
   // Todo: Make the meta fields remember their visibility?
-  toggle_extra_fields : function(anchor) {
-    if(anchor.innerHTML == "More...") {
+  toggle_extra_fields : function(anchor, more_label, less_label) {
+    if(anchor.innerHTML == more_label) {
       Show.these(
         'slug_row',
         'keywords_row',
@@ -158,7 +158,7 @@ var ComatoseEditForm = {
         'filter_row',
         'created_row'
       );
-      anchor.innerHTML = 'Less...';
+      anchor.innerHTML = less_label;
     } else {
       Hide.these(
         'slug_row',
@@ -167,15 +167,15 @@ var ComatoseEditForm = {
         'filter_row',
         'created_row'
       );
-      anchor.innerHTML = 'More...';
+      anchor.innerHTML = more_label;
     }
   },
   // Uses server to create preview of content...
-  preview_content : function(preview_url) {
+  preview_content : function(preview_url, preview_label) {
     $('preview-area').show();
     var params = Form.serialize(document.forms[0]);
     if( params != this.last_preview ) {
-      $('preview-panel').innerHTML = "<span style='color:blue;'>Loading Preview...</span>";
+      $('preview-panel').innerHTML = "<span style='color:blue;'>" + preview_label + "</span>";
       new Ajax.Updater(
          'preview-panel',
          preview_url,
@@ -184,11 +184,11 @@ var ComatoseEditForm = {
     }
     this.last_preview = params;
   },
-  cancel : function(url) {
+  cancel : function(url, cancel_warning) {
     var current_data = Form.serialize(document.forms[0]);
     var data_changed = (this.default_data != current_data) 
     if(data_changed) {
-      if( confirm('Changes detected. You will lose all the updates you have made if you proceed...') ) {
+      if( confirm(cancel_warning) ) {
         location.href = url;
       }
     } else {
diff --git a/public/stylesheets/comatose_admin.css b/public/stylesheets/comatose_admin.css
index a202a66..ed238c2 100644
--- a/public/stylesheets/comatose_admin.css
+++ b/public/stylesheets/comatose_admin.css
@@ -1,329 +1,124 @@
 
-/* Page Listing */
-#content .tree-controller {
-  border: 0px;
-  cursor: pointer;
-}
-#content .page-list.root {
-  clear: both;
-  list-style: none;
-  margin: 0px;
-  padding: 0px;
-  margin-top: 10px;
-}
-#content .page-list.collapsed {
+/************************************
+ * listing stuff
+ ************************************/
+#content .handle, #content .do-reorder UL LI .handle {
   display: none;
 }
-#content .page-list {
-  /* background: white; */
-  clear: both;
-  list-style: none;
-  border-left: none;
-  margin: 0px;
-  padding: 0px;
-  padding-left: 15px;
-  margin-top: 2px;
-}
-#content .page-list LI {
-  clear: both;
-  padding: 0px;
-  margin: 5px 0px;
-  padding-top: 2px;
-  padding-right: 0px;
-  padding-left: 2px;
-}
-#content .page-list .commands {
-  font-size: 90%;
-  padding-left: 5px;
-}
-#content .page-list .commands A {
-  /* color: gray; */
-}
-#content .page-list .commands A.add-page:hover {
-  /* color: blue; */
-}
-#content .page-list .commands A.reorder-children:hover {
-/*   color: black; */
-}
-#content .page-list .commands A.delete-page:hover {
-/*   color: white; */
+#content .do-reorder LI .handle {
+  display: inline;
+  background: gray;
+  color: white;
+  padding: 1px 3px;
+  cursor: move;
 }
-#content .page-list .commands A.reordering {
-/*   background: navy; */
-/*   color: white; */
+
+ul.page-list li {
+  list-style: none;
 }
-#content .page-list .commands A.reordering:hover {
-/*   color: white; */
+
+ul.page-list li table,
+ul.page-list li td {
+  border: none;
+  padding: 3px;
 }
-#content .page-list A.page {
-  text-decoration: none;
-/*   color: black; */
-  margin-left: 3px;
-  display: block;
+
+ul.page-list a.page {
+  font-weight: bold;
 }
-#content .page-list A.page:hover {
-  /*color: blue;*/
-  background: white url(../images/comatose/title-hover-bg.gif) top left repeat-y;
+
+ul.page-list a:visited, ul.page-list a:link {
+  color: #000;
 }
-#content .handle, #content .do-reorder UL LI .handle {
-  display: none;
+
+ul.page-list a:hover {
+  background: #aa9;
 }
 
 #content .page-list .hover {
-/*   background: #F1F0DB; */
+  background: #F1F0DB;
+}
+
+#content .page-list .commands A.delete-page:hover {
+  color: white;
+  background: black;
 }
 #content .page-list .hover-delete {
   background: red;
-/*   color: #FF8E90; */
+  color: #FF8E90;
 }
 #content .page-list .hover-delete A,
 #content .page-list .hover-delete .commands A {
-/*   color: #FF8E90; */
+  color: #FF8E90;
 }
 #content .page-list .hover-delete A.page {
-/*   color: white; */
+  color: white;
   border-bottom: 0px;
 }
 #content .page-list .hover-delete UL LI A.page {
-/*   color: red; */
+  color: red;
   border-bottom: 0px;
 }
 
-#content .do-reorder LI .handle {
-  display: inline;
-/*   background: gray; */
-/*   color: white; */
-  padding: 1px 3px;
-  cursor: move;
-}
-
-#content .page-list .do-reorder .commands A {
-  display: none;
-}
-
-/* Page Form */
-#content .page-form {
-  margin-top: 10px;
-}
-#content .page-form LABEL {
-  font-weight: bold;
-/*   color: #555; */
-}
-#content .page-form .meta-info LABEL {
-/*   color: #999 !important; */
+/***********************************
+ * from stuff
+ ***********************************/
+div.comatose_field {
 }
-#content .page-form .label { 
-  padding-top: 5px;
-  width: 75px;
-  text-align: right;
-  padding-right: 10px;
-}
-#content .page-form .label.body {
-  vertical-align: top;
-  padding-top: 10px;
-} 
-#content .page-form .field { 
-  padding-top: 5px;  
-}
-#content .page-form .field-help { 
-/*   color: gray; */
-}
-#content .page-form #page_title {
+div.comatose_field label {
+  display: block;
   font-weight: bold;
 }
-#content .page-form #page_slug {
-/*   color: gray; */
-}
-#content .page-form #page_body {
-  font-family: monospace;
-}
 
-#content #button-group {
-  padding: 10px;
-  text-align: right;
-/*   background-color: #EAEAEA; */
-  margin-top: 10px;
-}
-#content #button-group .last-update {
-  float: left;
-/*   color: gray; */
-  padding-top: 4px;
-  font-weight: bold;
-}
-#content #button-group .last-update LABEL {
-  font-weight: normal;
-}
-#content #button-group .last-update A {
-/*   color: gray; */
-}
-#content #button-group A {
-/*   color: maroon; */
+div.comatose_field textarea {
+  width: 90%;
 }
-#content #button-group A:hover {
-/*   color: red; */
+div.comatose_field textarea, 
+div.comatose_field input, 
+div.comatose_field select {
+  border: 1px solid gray;
 }
 
-#content #preview-area {
-  margin-top: 10px;
-}
-#content #preview-area FIELDSET {
-/*   border: 1px solid silver; */
-}
-#content #preview-area LEGEND {
-  font-size: 125%;
-}
-#content #preview-area .preview-body {
-  padding: 10px;
-}
-#content #preview-area .preview-note {
-/*   background: #FFFFD9; */
-  padding: 15px;
-}
-#content #preview-area .commands {
-  text-align: right;
-/*   color: gray; */
-}
-#content #preview-area .commands A {
-/*   color: gray; */
-}
-#content #preview-area .commands A:hover {
-/*   color: black; */
-}
-#content .revisions {
-  padding: 10px;
-  width: 49%; 
-}
-#content .current-content {
-}
-#content .older-content {
-/*   background: #E9E9E9; */
-  float: right;
-}
+/****************************************
+ * revisions page stuff
+ ****************************************/
 
-#content .revisions label {
-  display: block;
-/*   color: #000; */
-}
-#content .revisions label span {
-/*   color: #999; */
-  font-weight: normal !important;
-}
-#content .revisions .title {
-  font-weight: bold;
-  margin-top: 5px;
-}
-#content .revisions .header {
-  font-size: 110%;
-  vertical-align: middle;
-  font-weight: bold;
-}
-#content .revisions .header-actions {
+.older-content {
   float: right;
-  font-size: 90%;
-  font-weight: normal;
-/*   color: #999; */
-}
-#content .revisions .meta {
-  margin-bottom: 15px;
-}
-#content .revisions .footer {
-  margin-top: 25px !important;
-  text-align: center !important;
-}
-#content #go-btn {
-  display: none;
 }
-/* Errors */
-#errorExplanation {
-  border: 1px solid red;
-/*   background: #FFEAEB; */
-  padding: 10px;
-  margin-top: 10px;
-}
-#errorExplanation h2 {
-  margin: 0px;
-  padding: 0px;
-/*   color: maroon; */
-}
-#errorExplanation p {
-  margin: 0px;
-  padding: 0px;
-  padding-top: 5px;
-  padding-left: 15px;
-}
-#errorExplanation ul {  
-  margin: 0px;
-  padding: 0px;
-  padding-left: 35px;
-}
-#errorExplanation li {
-  margin: 0px;
-  padding: 0px;  
-  padding-top: 5px;
+.current-content {
+  float: left;
 }
 
-/* Footer Area*/
-/*
-#footer {
-  border-top: 4px solid #AAA;
-  text-align: center;
-  font-size: 90%;
-  color: #AAA;
-  padding-top: 5px;
-  padding-bottom: 5px;
+.revisions {
+  width: 47%;
+  border: 1px solid gray;
+  padding: 0.25em;
 }
-#footer A {
-  color: #AAA;
-  text-decoration: none;
+
+.revisions .header {
   font-weight: bold;
+  border-bottom: 1px solid black;
+  margin-bottom: 10px;
+  height: 40px;
 }
-#footer A:hover {
-  color: #333;
-  text-decoration: underline;
-}
-*/
-
-/* Modifiers */
 
-/* When JavaScript is Turned Off... We need to adjust some things... */
-.noscript #more-options,
-.noscript #preview-area,
-.noscript #preview-btn,
-.noscript .tree-controller {
-  display: none;
-}
-.noscript .page-list.collapsed {
-  display: block !important;
-}
-.noscript .delete-page:hover {
-  color: red !important;
-}
-.noscript #content .page-form #page_title,
-.noscript #content .page-form #page_slug,
-.noscript #content .page-form #page_parent,
-.noscript #content .page-form #page_keywords,
-.noscript #content .page-form #page_body {
-  width: 100% !important;
-}
-.noscript #content .revisions #go-btn {
-  display: inline;
+.revisions .meta {
+  border-bottom: 1px solid black;
+  margin-bottom: 10px;
 }
 
-ul.page-list li table,
-ul.page-list li td {
-  border: none;
+.revisions .footer {
+  border-top: 1px solid black;
+  margin-top: 10px;
+  padding: 0.25em;
 }
 
-div.comatose_field label {
-  display: block;
+.revisions .meta label span {
   font-weight: bold;
 }
 
-div.comatose_field textarea {
-  width: 100%;
-}
-div.comatose_field textarea, 
-div.comatose_field input, 
-div.comatose_field select {
-  border: 1px solid gray;
+.revisions .meta label {
+  font-weight: normal;
+  display: block;
 }
--
libgit2 0.21.2