diff --git a/src/Orchard.Web/Themes/Green/Content/Images/logo.gif b/src/Orchard.Web/Themes/Green/Content/Images/logo.gif
index 6c82c0020..07a475fc9 100644
Binary files a/src/Orchard.Web/Themes/Green/Content/Images/logo.gif and b/src/Orchard.Web/Themes/Green/Content/Images/logo.gif differ
diff --git a/src/Orchard.Web/Themes/Green/Content/Images/logo.png b/src/Orchard.Web/Themes/Green/Content/Images/logo.png
index e7c0838fc..e0928130d 100644
Binary files a/src/Orchard.Web/Themes/Green/Content/Images/logo.png and b/src/Orchard.Web/Themes/Green/Content/Images/logo.png differ
diff --git a/src/Orchard.Web/Themes/Green/Styles/site.css b/src/Orchard.Web/Themes/Green/Styles/site.css
index 1dc7e37b4..295219aff 100644
--- a/src/Orchard.Web/Themes/Green/Styles/site.css
+++ b/src/Orchard.Web/Themes/Green/Styles/site.css
@@ -84,34 +84,45 @@ a:active {color:#006699; text-decoration:none;}
 /* Forms
 ----------------------------------------------------------*/
 
-fieldset, #CommentText, input.text {
+fieldset, input[type="text"], #CommentText, #password {
     border:1px solid #DDDEDF;
+    display: block;
     -moz-border-radius:6px;
 	-webkit-border-radius:6px;
 }
 
 fieldset {
-    margin: 20px;
-    padding: 10px;
+    margin: 20px 20px 20px 10px;
     }
 
 label {
     display: block;
+    margin:20px 0 2px 10px;
     font-weight:600;
     }
 
-#CommentText, input.text {
+input[type="text"], #CommentText, #password {
     border-color:#cacec6;
     padding:2px;
-    margin:2px 0;
+    margin:2px 0 20px 10px;
     width:80%;
     }
 
-.button {
+input[type="checkbox"] {
+    margin:2px 0 20px 10px;
+}
+
+input[type="submit"], input[type="button"] {
     padding:2px 14px;
-    margin:6px 0;
+    display: block;
+    margin:2px 0 20px 10px;
     font-weight:600;
     }
+  
+.forcheckbox {
+    margin:0 0 0 4px;
+    display:inline;
+}
 
 
 
@@ -207,9 +218,9 @@ colgroup
 	float:right;
 }
 
-#mainColumn {margin:10px 0 0 20px;}
+#maincolumn {margin:10px 0 0 20px;}
 
-#subColumn1 {
+#subcolumn1 {
     margin:43px 10px 10px 10px;
     padding:4px 0 12px 0;
     border:1px solid #e1e7df;
diff --git a/src/Orchard.Web/Themes/Green/Views/layout.ascx b/src/Orchard.Web/Themes/Green/Views/layout.ascx
index 4a02fdc2c..f0a7f2efc 100644
--- a/src/Orchard.Web/Themes/Green/Views/layout.ascx
+++ b/src/Orchard.Web/Themes/Green/Views/layout.ascx
@@ -31,14 +31,14 @@
 <%-- Begin Page Content --%>
   <div id="bd" role="main">
     <div id="yui-main">
-      <div id="mainColumn" class="yui-b">
+      <div id="maincolumn" class="yui-b">
         <div class="yui-g coreWidget">
           <%--Main Content--%>
           <%Html.ZoneBody("content");%>
         </div>
       </div>
     </div>
-    <div id="subColumn1" class="yui-b">
+    <div id="subcolumn1" class="yui-b">
       <%--Start widgets--%>
       This was our old widget zone
     </div>