diff --git a/dev/scss/base/form.scss b/dev/scss/base/form.scss
index b2ae781..d5c9aba 100644
--- a/dev/scss/base/form.scss
+++ b/dev/scss/base/form.scss
@@ -31,11 +31,11 @@
     text-align: left;
   }
   
-  label[for], input[type=submit] {
+  label[for], input[type=submit], a.form-button {
     margin-top: 2em;
   }
 
-  input, textarea, button {
+  input, textarea, button, a.form-button {
     border-radius: $standard-border-radius;
   }
   
@@ -45,11 +45,11 @@
     border-style: solid;
   }
   
-  input, textarea, select {
+  input, textarea, select, a.form-button {
+    border-style: solid;
     display: inline-block;
     width: 20%;
     min-width: 20em;
-    // margin: 0 20pt 0 20pt;
     padding: $base-padding;
   }
 
@@ -69,19 +69,39 @@
     border-color: $ids-pink-1;
   }
 
-  input:not([type=radio]), button {
+  /*
+  input:not([type=radio]),
+  button,
+  a.form-button {
      height: 3em;
   }
+*/
 
-  input[type=submit], button {
-     display: inline-block;
-     text-align: center;
-     background-color: $middle-green;
-     border-color: $dark-green;
+  input[type=submit],
+  button,
+  a.form-button {
+    display: inline-block;
+    cursor: pointer;
+    border-width: thin;
+    text-align: center;
+    background-color: $middle-green;
+    border-color: $dark-green;
+    font-size: 8pt;
+    color: $dark-green;
   }
 
+  a.form-button:hover {
+    color: default !important;
+  }
+  
   label.field-required::after {
     color: $ids-blue-1;
     content:'*';
   }
-}
\ No newline at end of file
+}
+
+.button-abort {
+  background-color: $middle-orange !important;
+  color: $darkest-orange !important;
+  border-color: $darkest-orange !important;
+}
diff --git a/dev/scss/main/buttongroup.scss b/dev/scss/main/buttongroup.scss
index 756ad58..55bd6b9 100644
--- a/dev/scss/main/buttongroup.scss
+++ b/dev/scss/main/buttongroup.scss
@@ -9,7 +9,6 @@
     cursor: pointer;
   }
 
-
   span.button-icon {
     font-family: 'FontAwesome';
     > span {
@@ -18,9 +17,10 @@
   }
   
   &.button-panel, &.operators {
-    > span {
+    > span, a {
       box-shadow: $choose-box-shadow;
       font-size: 9pt;
+      font-weight: normal;
       line-height: 1.5em;
       padding: 0 4px;
       display: inline-block;
@@ -48,19 +48,21 @@
   }
 
   &.button-panel {
-    > span > span.check {
-      font-family: 'FontAwesome';
-      width: 1.2em;
-      display: inline-block;
-      text-align: left;
-      &:not(.checked)::after {
-        content: $fa-check;
-      }
-      &.checked::after {
-        content: $fa-checked;
-      }
-      > span {
-        @include blind;
+    > span, a {
+      > span.check {
+        font-family: 'FontAwesome';
+        width: 1.2em;
+        display: inline-block;
+        text-align: left;
+        &:not(.checked)::after {
+          content: $fa-check;
+        }
+        &.checked::after {
+          content: $fa-checked;
+        }
+        > span {
+          @include blind;
+        }
       }
     }
   }
diff --git a/dev/scss/main/oauth.scss b/dev/scss/main/oauth.scss
index fc41fcb..0b37285 100644
--- a/dev/scss/main/oauth.scss
+++ b/dev/scss/main/oauth.scss
@@ -1,23 +1,28 @@
 ul.client-list {
   padding-left: 1.5em;
-  li {
+  li.client {
     list-style-type: none;
     span.client-name {
       &::before {
-        display: inline-block;
-        width: 1.5em;
         margin-left: -1.5em;
-        content: $fa-plugin;
-        font-family: 'FontAwesome';
-        color: $ids-blue-1;
-        font-size: 100%;
       }
       font-weight: bold;
-      display: block;
     }
     span.client-desc {
       font-size: 70%;
       display: block;
     }
   }
+}
+
+span.client-name {
+  &::before {
+    display: inline-block;
+    width: 1.5em;
+    content: $fa-plugin;
+    font-family: 'FontAwesome';
+    color: $ids-blue-1;
+    font-size: 100%;
+  }
+  font-weight: bold;
 }
\ No newline at end of file