diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml
index 3d95ace..d3c3de4 100644
--- a/app/views/layouts/application.rhtml
+++ b/app/views/layouts/application.rhtml
@@ -6,25 +6,50 @@
     <%= stylesheet_link_tag_theme @chosen_theme %>
 
   </head>
-  <body>
 
+  <body>
     <%= image_tag 'loading.gif', :id => 'spinner', :style => "display:none; float:right;" %>
-
-    <%= link_to _('Show Layout'), :controller => 'home' %>
-    <%= link_to _('Edit Layout'), :controller => 'edit_template' %>
-
-    <%= select_template(@owner, @chosen_template) %>
-    <%= select_theme(@owner, @chosen_theme) %>
-    <%= select_icons_theme(@owner, @chosen_icons_theme) %>
-
-    <%= display_icon('back', @chosen_icons_theme )%>
-
-    <%= flash[:notice] %>
-
-    <%= display_boxes(@boxes, yield) %>
-
-    <div id="footer">
-      footer content
+    <div id="wrap">
+      <div id="box">
+        <div id="menu">
+          Skip to:
+          <a href="#content">Content</a> | 
+          <a href="#sidebar">Navigation</a> | 
+          <a href="#footer">Footer</a>
+        </div>
+
+        <div id="header">
+          <h1> 
+            <a href="index.html">1024<span class="fade">px</span></a>
+          </h1>
+          <p id="slogan">when 800px just isn't enough...</p>
+        </div>
+
+        <%= link_to _('Show Layout'), :controller => 'home' %>
+        <%= link_to _('Edit Layout'), :controller => 'edit_template' %>
+
+        <%= select_template(@owner, @chosen_template) %>
+        <%= select_theme(@owner, @chosen_theme) %>
+        <%= select_icons_theme(@owner, @chosen_icons_theme) %>
+
+        <%= display_icon('back', @chosen_icons_theme )%>
+
+        <%= flash[:notice] %>
+
+        <%= display_boxes(@boxes, yield) %>
+        <div class="clearfix"></div>
+
+        <div id="footer">
+          <p>
+            <a href="#">Contact us</a> | 
+            <a href="#">Privacy policy</a> | 
+            <a href="#">Sitemap</a> | 
+            <a href="#">RSS</a> | 
+            <a href="#header">Back to top</a><br />
+            &copy; 2007 <a href="#">Your Name</a> | Design by <a href="http://andreasviklund.com/">Andreas Viklund</a>
+          </p>
+        </div>
+      </div>
     </div>
 
   </body>
diff --git a/public/templates/default/default.yml b/public/templates/default/default.yml
index 0e29273..7c0cef5 100644
--- a/public/templates/default/default.yml
+++ b/public/templates/default/default.yml
@@ -1,2 +1,2 @@
 default:
-  number_of_boxes: 3
+  number_of_boxes: 2
diff --git a/public/templates/default/images/b.gif b/public/templates/default/images/b.gif
new file mode 100644
index 0000000..c46f9b8
Binary files /dev/null and b/public/templates/default/images/b.gif differ
diff --git a/public/templates/default/images/corner.gif b/public/templates/default/images/corner.gif
new file mode 100644
index 0000000..a88cef3
Binary files /dev/null and b/public/templates/default/images/corner.gif differ
diff --git a/public/templates/default/images/corner2.gif b/public/templates/default/images/corner2.gif
new file mode 100644
index 0000000..b39b46c
Binary files /dev/null and b/public/templates/default/images/corner2.gif differ
diff --git a/public/templates/default/images/www.jpg b/public/templates/default/images/www.jpg
new file mode 100644
index 0000000..7834281
Binary files /dev/null and b/public/templates/default/images/www.jpg differ
diff --git a/public/templates/default/stylesheets/default.css b/public/templates/default/stylesheets/default.css
deleted file mode 100644
index a9fbb95..0000000
--- a/public/templates/default/stylesheets/default.css
+++ /dev/null
@@ -1,48 +0,0 @@
-.edit_mode .hover {
-  background-color: pink;
-  border: 2px dotted black;
-}
-
-.edit_mode .hover ul li {
-  border: 2px dotted black;
-}
-
-.edit_mode #box_1 ul, .edit_mode #box_2 ul, .edit_mode #box_3 ul {
-  list-style: none;
-  cursor: -moz-grab;
-  margin: 10px;
-  padding:0px;
-  
-}
-
-.edit_mode #box_1 ul li, .edit_mode #box_2 ul li, .edit_mode #box_3 ul li {
-  list-style: none;
-  cursor: -moz-grab;
-  border: 1px solid black;
-  margin: 15px;
-}
-
-.edit_mode #box_1, .edit_mode #box_2, .edit_mode #box_3 {
-  border: 3px solid green;
-}
-
-#box_1 {
-  width: 200px;
-  float: left;
-}
-#box_2 {
-  width: 600px;
-  float: left;
-  margin: 0px 10px 0px 10px;
-}
-#box_3 {
-  width: 400px;
-
-  clear: both;
-}
-
-#footer{
-  font-size: 30px;
-  background: #FFFFFF url('../images/colivre_logo.png') repeat-x;
-}
-
diff --git a/public/templates/default/stylesheets/style.css b/public/templates/default/stylesheets/style.css
new file mode 100644
index 0000000..d37c4e5
--- /dev/null
+++ b/public/templates/default/stylesheets/style.css
@@ -0,0 +1,163 @@
+/*
+This stylesheet is part of the [in] business template downloaded from the oswd.org site 
+
+The stylesheet and template where made by Tjobbe Andrews from NOW:design www.now-design.co.uk
+*/
+html {
+	width: 100%
+}
+
+body {
+	font-family: "Trebuchet MS", verdana, arial, "Times New Roman";
+	font-size: 90%;
+	color: #3D3535;
+	background-color: #E4E5E0;
+	margin: 0px;
+	padding: 0px;
+	line-height: 140%;
+
+}
+
+/* Wrapper */
+#wrap {
+	text-align: center; 
+	width: 100%;
+	background-color: #E4E5E0;
+}
+
+/* the container */
+#box {
+	background-color: #FFFFFF;
+	margin-left: auto; 
+	margin-right: auto;	 
+	padding: 20px; 
+	text-align: left; 
+	width: 90%;
+}
+
+/*holds the tabs at the top*/
+#menu {
+	background-color: #FFFFFF;
+	text-align: right; 
+	border-bottom: 1px solid #FFFFFF;
+}
+
+/*holds the logo and image*/
+#header {
+	background-color: #EDEEEA;
+	padding: 10px; 
+	margin-top:3px;
+	height: 95px;
+	background: #EDEEEA url(../images/www.jpg) no-repeat right top;
+}
+
+/*defines the colours for the tabs, with corner background images*/
+#menu a:link, #menu a:active, #menu a:visited {
+	background: #EDEEEA url(../images/corner.gif) no-repeat right top;
+	color: #3D3535;
+	text-decoration: none;
+	padding: 3px 7px 3px 7px;
+	margin: 0 0 0 4px;
+}
+
+#menu a:hover {
+	background: #D6D8CF url(../images/corner2.gif) no-repeat right top;
+	color: #000000;
+	text-decoration: none;
+	padding: 3px 7px 3px 7px;
+	margin: 0 0 0 4px;
+}
+
+/*just a fix, taken from http://www.positioniseverything.net/easyclearing.html*/
+.clearfix:after {
+    content: "."; 
+    display: block; 
+    height: 0; 
+    clear: both; 
+    visibility: hidden;
+}
+
+.clearfix {
+	display: inline-table;
+}
+
+/* Hides from IE-mac \*/
+* html .clearfix {
+	height: 1%;
+}
+
+.clearfix {
+	display: block;
+}
+/* End hide from IE-mac */
+
+/*the main text container*/
+#box_2 {
+  height: 600px;
+}
+
+#box_2 h1 {
+	font-size: 110%;
+	margin: 10px 0px 0px 0px;
+	padding: 0px 0px 0px 0px;
+	border-bottom: 2px solid #A53512;
+}
+
+/*this is the right hand bar, news bar, links bar w/e*/
+#box_1 {
+	margin-top: 20px;
+        padding-left: 20px;
+	width: 245px;
+	float: right;
+	background-color: white;
+
+}
+
+#box_1 h1 {
+	background-color: #A53512;
+	color: #FFFFFF;
+	padding: 3px;
+	margin: 0px 0px 0px 0px;
+	font-size: 100%;
+	font-weight: normal;
+}
+
+/*this just lets you have a "comment" type area in the main content*/
+.p1 {
+	padding: 20px;
+	background-color: #F7F7F4;
+	font-size:90%;
+}
+
+/*sets the padding for the newsbar text, not the headings*/
+.p2 {
+	padding: 20px;
+	background-color: #FFFFFF;
+	font-size: 90%;
+	list-style-image: url(../images/b.gif);
+	list-style-position: 10px;
+}
+
+.p2 ul {
+	margin: 0px 0px 0px 0px;
+	padding: 0px 0px 0px 0px;
+}
+
+/*the footer, with copyright*/
+.footer {
+clear:both;
+	background-color: #D6D8CF;
+	padding: 4px;
+	font-size: 80%;
+	text-align: center;
+}
+
+/*sets the link colours and style*/
+a:link, a:active, a:visited {
+	color: #A53512;
+}
+
+a:hover {
+	color: #A53512;
+	text-decoration: none;
+}
diff --git a/public/templates/simple/images/background.gif b/public/templates/simple/images/background.gif
new file mode 100644
index 0000000..7ebcb97
Binary files /dev/null and b/public/templates/simple/images/background.gif differ
diff --git a/public/templates/simple/images/example.jpg b/public/templates/simple/images/example.jpg
new file mode 100644
index 0000000..2740bc0
Binary files /dev/null and b/public/templates/simple/images/example.jpg differ
diff --git a/public/templates/simple/simple.yml b/public/templates/simple/simple.yml
index 6e406fa..1795702 100644
--- a/public/templates/simple/simple.yml
+++ b/public/templates/simple/simple.yml
@@ -1,2 +1,2 @@
 simple:
-  number_of_boxes: 4
+  number_of_boxes: 3
diff --git a/public/templates/simple/stylesheets/1024px.css b/public/templates/simple/stylesheets/1024px.css
new file mode 100644
index 0000000..ba38c8c
--- /dev/null
+++ b/public/templates/simple/stylesheets/1024px.css
@@ -0,0 +1,297 @@
+/* 1024px - a free xhtml/css website template by Andreas Viklund - http://andreasviklund.com/ - that may be used for any purpose as long as the proper credits are given to the original designer.
+
+Version: 2.0 (Jan 29, 2007)
+
+Screen layout: */
+
+/*** General tags ***/
+
+body {
+background:url(../images/background.gif) repeat-y top center #fff;
+color:#404040;
+font:76% Verdana,Tahoma,Arial,sans-serif;
+line-height:1.2em;
+margin:0 auto;
+padding:0;
+}
+
+a {
+color:#4088b8;
+font-weight:700;
+text-decoration:none;
+}
+
+a:hover {
+text-decoration:underline;
+}
+
+a img {
+border:0;
+}
+
+p {
+margin:0 0 18px 10px;
+}
+
+ul,ol,dl {
+font-size:0.9em;
+margin:2px 0 16px 35px;
+}
+
+ul ul,ol ol {
+margin:4px 0 4px 35px;
+}
+
+blockquote {
+border:1px solid #dadada;
+font-size:0.9em;
+margin:20px 10px;
+padding:8px;
+}
+
+h1 {
+color:#4088b8;
+font-size:4.2em;
+letter-spacing:-5px;
+margin:0 0 30px 25px;
+}
+
+h1 a {
+color:#4088b8;
+text-transform:none;
+}
+
+h2 {
+border-bottom:4px solid #dadada;
+color:#4088b8;
+font-size:1.4em;
+letter-spacing:-1px;
+margin:0 0 10px;
+padding:0 2px 2px 5px;
+}
+
+h3 {
+border-bottom:1px solid #dadada;
+color:#4088b8;
+font-size:1.2em;
+font-weight:700;
+margin:10px 0 8px;
+padding:1px 2px 2px 3px;
+}
+
+/*** Main wrap and header ***/
+
+#wrap {
+color:#404040;
+margin:10px auto;
+padding:0;
+width:970px;
+}
+
+#header {
+margin:0;
+}
+
+#menu {
+font-size:0.9em;
+padding:5px 2px 2px 3px;
+text-align:right;
+}
+
+#menu a {
+color:gray;
+}
+
+#slogan {
+color:gray;
+font-size:1.5em;
+font-weight:700;
+letter-spacing:-1px;
+line-height:1.2em;
+margin:15px 0 20px 35px;
+}
+
+/*** Sidebar and menu ***/
+
+#box_1 {
+float:left;
+line-height:1.4em;
+padding:1px 0 0;
+width:20%;
+}
+
+#box_1 ul {
+font-size:0.9em;
+list-style:none;
+margin:0;
+padding:0 0 15px 10px;
+}
+
+#box_1 li {
+list-style:none;
+margin:0 0 4px;
+padding:0;
+}
+
+#box_1 li a {
+font-size:1.2em;
+font-weight:700;
+padding:2px;
+}
+
+#box_1 ul ul {
+line-height:1.2em;
+margin:4px 0 3px 15px;
+padding:0;
+}
+
+#box_1 ul ul li a {
+font-weight:400;
+}
+
+#box_1 h2 {
+margin:3px 0 8px;
+}
+
+/*** Box 3 ***/
+
+#box_3 {
+float:left;
+line-height:1.4em;
+padding:1px 0 0;
+width:20%;
+}
+
+#box_3 ul {
+font-size:0.9em;
+list-style:none;
+margin:0;
+padding:0 0 15px 10px;
+}
+
+#box_3 li {
+list-style:none;
+margin:0 0 4px;
+padding:0;
+}
+
+#box_3 li a {
+font-size:1.2em;
+font-weight:700;
+padding:2px;
+}
+
+#box_3 ul ul {
+line-height:1.2em;
+margin:4px 0 3px 15px;
+padding:0;
+}
+
+#box_3 ul ul li a {
+font-weight:400;
+}
+
+#box_3 h2 {
+margin:3px 0 8px;
+}
+
+
+/*** Main content ***/
+
+
+#box_2 {
+float:left;
+line-height:1.5em;
+margin:0px 20px 0px 20px;
+padding:0;
+text-align:left;
+width: 540px;
+}
+
+#box_2 h3 {
+margin:10px 0 8px;
+}
+
+/*** Footer ***/
+
+#footer {
+border-top:4px solid #dadada;
+clear:both;
+color:gray;
+font-size:0.9em;
+line-height:1.6em;
+margin:0 auto;
+padding:8px 0;
+text-align:right;
+}
+
+#footer p {
+margin:0;
+padding:0;
+}
+
+#footer a {
+color:#808080;
+}
+
+/*** Various classes ***/
+
+.box {
+background:#4088b8;
+border:1px solid #c8c8c8;
+color:#fff;
+font-size:0.9em;
+line-height:1.4em;
+padding:10px 10px 10px 13px;
+}
+
+.box a {
+color:#f0f0f0;
+}
+
+.left {
+float:left;
+margin:0 15px 4px 0;
+}
+
+.right {
+float:right;
+margin:0 0 4px 15px;
+}
+
+.readmore {
+margin:-10px 10px 12px 0;
+text-align:right;
+}
+
+.timestamp {
+font-size:1.2em;
+margin:-5px 0 15px 10px;
+}
+
+.timestamp a {
+font-weight:normal;
+}
+
+.blue {
+color:#4088b8;
+}
+
+.clear {
+clear:both;
+}
+
+.fade {
+color:#c8c8c8;
+}
+
+.gray {
+color:gray;
+}
+
+.photo {
+background:#fff;
+border:1px solid #bababa;
+margin:6px 18px 2px 5px;
+padding:2px;
+}
diff --git a/public/templates/simple/stylesheets/default.css b/public/templates/simple/stylesheets/default.css
deleted file mode 100644
index ace53bd..0000000
--- a/public/templates/simple/stylesheets/default.css
+++ /dev/null
@@ -1,51 +0,0 @@
-.edit_mode .hover {
-  background-color: white;
-  border: 2px dotted red;
-}
-
-.edit_mode .hover ul li {
-  border: 2px dotted yellow;
-}
-
-.edit_mode #box_1 ul, .edit_mode #box_2 ul, .edit_mode #box_3 ul, .edit_mode #box_4 ul {
-  list-style: none;
-  cursor: -moz-grab;
-  margin: 10px;
-  padding:0px;
-  
-}
-
-.edit_mode #box_1 ul li, .edit_mode #box_2 ul li, .edit_mode #box_3 ul li , .edit_mode #box_4 ul li{
-  list-style: none;
-  cursor: -moz-grab;
-  border: 5px solid black;
-  margin: 15px;
-}
-
-.edit_mode #box_1, .edit_mode #box_2, .edit_mode #box_3, .edit_mode #box_4 {
-  border: 3px solid brown;
-}
-
-#box_1 {
-  width: 200px;
-  float: left;
-}
-#box_2 {
-  width: 600px;
-  float: left;
-  margin: 0px 10px 0px 10px;
-}
-#box_3 {
-  width: 400px;
-  clear: both;
-}
-
-#box_4 {
-  width: 500px;
-  clear: both;
-}
-#footer{
-  font-size: 30px;
-  background: #FFFFFF url('../images/ufba_logo.png') repeat-x;
-}
-
--
libgit2 0.21.2