Index: /trunk/grails-app/views/assetDetailed/search.gsp
===================================================================
--- /trunk/grails-app/views/assetDetailed/search.gsp	(revision 220)
+++ /trunk/grails-app/views/assetDetailed/search.gsp	(revision 221)
@@ -25,5 +25,7 @@
 
             <div class="paginateButtons">
-                <filterpane:filterButton text="Search" appliedText="Change Search" />
+                <span class="searchButtons">
+                    <filterpane:filterButton text="Search" appliedText="Change Search" />
+                </span>
                 Results:${assetInstanceTotal}
             </div>
Index: /trunk/grails-app/views/inventoryItemDetailed/search.gsp
===================================================================
--- /trunk/grails-app/views/inventoryItemDetailed/search.gsp	(revision 220)
+++ /trunk/grails-app/views/inventoryItemDetailed/search.gsp	(revision 221)
@@ -26,5 +26,7 @@
 
             <div class="paginateButtons">
-                <filterpane:filterButton text="Search" appliedText="Change Search" />
+                <span class="searchButtons">
+                    <filterpane:filterButton text="Search" appliedText="Change Search" />
+                </span>
                 Results:${inventoryItemInstanceTotal}
             </div>
Index: /trunk/grails-app/views/login/auth.gsp
===================================================================
--- /trunk/grails-app/views/login/auth.gsp	(revision 220)
+++ /trunk/grails-app/views/login/auth.gsp	(revision 221)
@@ -28,6 +28,21 @@
     height: 1%;
 }
+#login .loginButton {
+    float: left;
+    background: #fff url(../images/skin/shadow.jpg) bottom repeat-x;
+    border: 1px solid #ccc;
+    border-color: #ccc #aaa #aaa #ccc;
+    margin: 0;
+}
 #login .inner .cssform input[type='text'] {
     width: 120px;
+}
+#login .inner .cssform input[type='submit'] {
+    background: transparent url(../images/skin/key_go.png) 5px 50% no-repeat;
+    padding-left: 28px;
+    border: none;
+    cursor: pointer;
+    margin: 0;
+    overflow: hidden;
 }
 #login .inner .cssform input[type='submit']:link {
@@ -36,5 +51,7 @@
 }
 #login .inner .cssform input[type='submit']:hover {
-    background:#bfdaff;
+    /*background: #bfdaff;*/
+}
+#login .inner .cssform input[type='submit']:focus {
 }
 #login .inner .cssform label {
@@ -88,5 +105,7 @@
 
                 <p>
-                    <input type='submit' value='Login' />
+                    <span class="loginButton">
+                        <input type='submit' value='Login' />
+                    </span>
                 </p>
             </form>
Index: /trunk/grails-app/views/person/list.gsp
===================================================================
--- /trunk/grails-app/views/person/list.gsp	(revision 220)
+++ /trunk/grails-app/views/person/list.gsp	(revision 221)
@@ -24,5 +24,7 @@
 
         <div class="paginateButtons">
-            <filterpane:filterButton text="Search" appliedText="Change Search" />
+            <span class="searchButtons">
+                <filterpane:filterButton text="Search" appliedText="Change Search" />
+            </span>
             Results:${personTotal}
         </div>
Index: /trunk/grails-app/views/taskDetailed/search.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/search.gsp	(revision 220)
+++ /trunk/grails-app/views/taskDetailed/search.gsp	(revision 221)
@@ -33,7 +33,11 @@
 
             <div class="paginateButtons">
-                <a href='' onclick="showElement('searchPane'); return false;">Quick</a>
+                <span class="searchButtons">
+                    <a href='' onclick="showElement('searchPane'); return false;">Quick</a>
+                </span>
                 Results:${taskInstanceTotal}
-                <filterpane:filterButton text="Advanced" appliedText="Advanced" />
+                <span class="searchButtons">
+                    <filterpane:filterButton text="Advanced" appliedText="Advanced" />
+                </span>
             </div>
 
Index: /trunk/grails-app/views/taskDetailed/searchCalendar.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/searchCalendar.gsp	(revision 220)
+++ /trunk/grails-app/views/taskDetailed/searchCalendar.gsp	(revision 221)
@@ -34,7 +34,11 @@
 
             <div class="paginateButtons">
-                <a href='' onclick="showElement('searchPane'); return false;">Quick</a>
+                <span class="searchButtons">
+                    <a href='' onclick="showElement('searchPane'); return false;">Quick</a>
+                </span>
                 Results:${taskInstanceTotal}
-                <filterpane:filterButton text="Advanced" appliedText="Advanced" />
+                <span class="searchButtons">
+                    <filterpane:filterButton text="Advanced" appliedText="Advanced" />
+                </span>
             </div>
             <richui:calendarMonthView items="${taskInstanceList}"
Index: /trunk/grails-app/views/taskProcedureDetailed/list.gsp
===================================================================
--- /trunk/grails-app/views/taskProcedureDetailed/list.gsp	(revision 220)
+++ /trunk/grails-app/views/taskProcedureDetailed/list.gsp	(revision 221)
@@ -25,5 +25,7 @@
 
             <div class="paginateButtons">
-                <filterpane:filterButton text="Search" appliedText="Change Search" />
+                <span class="searchButtons">
+                    <filterpane:filterButton text="Search" appliedText="Change Search" />
+                </span>
                 Results:${taskProcedureInstanceTotal}
             </div>
Index: /trunk/web-app/css/main.css
===================================================================
--- /trunk/web-app/css/main.css	(revision 220)
+++ /trunk/web-app/css/main.css	(revision 221)
@@ -202,4 +202,10 @@
     border: 1px solid red;
 }
+input.medium {
+    width:60px;
+}
+input.medium.errors {
+    border: 1px solid red;
+}
 input.description {
     width:450px;
@@ -279,6 +285,4 @@
 
 .paginateButtons {
-    /*background: #fff url(../images/skin/shadow.jpg) bottom repeat-x;*/
-   /*border: 1px solid #ccc;*/
     border-top: 0;
     color: #666;
@@ -288,5 +292,5 @@
 }
 .paginateButtons a {
-    background: #fff;
+    background: #fff url(../images/skin/shadow.jpg) bottom repeat-x;
     border: 1px solid #ccc;
     border-color: #ccc #aaa #aaa #ccc;
@@ -299,4 +303,17 @@
 }
 
+.searchButtons {
+    background: #fff url(../images/skin/shadow.jpg) bottom repeat-x;
+    border: 1px solid #ccc;
+    border-color: #ccc #aaa #aaa #ccc;
+    margin: 0 0.5em;
+}
+.searchButtons a {
+    background: transparent url(../images/skin/database_search.png)  5px 50% no-repeat;
+    padding-left: 28px;
+    border: none;
+    margin: 0;
+}
+
 /* DIALOG */
 
@@ -319,4 +336,14 @@
 
 /* ACTION BUTTONS */
+.generalButton {
+    background: #fff url(../images/skin/shadow.jpg) bottom repeat-x;
+    color: #444;
+    font-size: 14px;
+    font-weight: bold;
+    cursor: pointer;
+    margin-left: 5px;
+    overflow: hidden;
+    padding: 0.1em 0.4em 0.1em 0.4em;
+}
 
 .buttons {
@@ -328,7 +355,6 @@
     margin-bottom: 5px;
     overflow: hidden;
-    padding: 0;
-}
-
+    padding: 3px;
+}
 .buttons input {
     background: #fff;
@@ -340,5 +366,5 @@
     margin-left: 3px;
     overflow: visible;
-    padding: 2px 6px;
+    padding: 0px 6px;
 }
 .buttons input.delete {