diff --git a/resources/css/style.css b/resources/css/style.css
index b591828aabf9d95cc449c1d2ea05637280dab54c..c47ac571951f38d870461db30bd46cf8d412e13b 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -13,12 +13,38 @@ body {
     min-height: 100%;
 }
 
+/* global */
 #content {
     margin: 0;
     padding: 2rem 1rem;
 }
+#languagebar {
+    font-size: 0.8rem;
+}
+button, .button {
+    background: #214BB5;
+    border: 2px solid #214BB5;
+    font-weight: bold;
+    border-radius: 10px;
+}
+button: hover, .button:hover {
+    background: none;
+    color: #214BB5;
+}
+h1, h2, h3, h4, h5, h6 {
+    color: #214BB5;
+}
+h3 {
+    margin-top: 2rem;
+}
+a, a: visited, a:active, a:link {
+    text-decoration: underline;
+}
+a: hover {
+    text-decoration: none;
+}
 
-/* Header*/
+/* header */
 header h1 {
     color: #FFFFFF;
     background-color: #FF8547;
@@ -31,19 +57,62 @@ header h1 {
     text-align: center;
 }
 
-/* Changes for foundation buttons*/
-button, .button {
-    background: #214BB5;
-    border: 2px solid #214BB5;
+/* main */
+main {
+    padding: 1rem 0.5rem;
+}
+
+main form {
+    width: 100%;
+    margin: 1rem;
+
+}
+main form table {
+    padding: 1rem;
+    margin: 1rem auto;
+    border: none;
+    border-radius: 7px;
+}
+main form table td {
+    color: #000!important;
+}
+
+main form table tr.even, main form table tr.alt, main form table tr: nth-of-type(2n) {
+    background: none!important;
+}
+
+main h2 {
+    font-size: 1.5rem;
+}
+
+main #table_with_attributes {
+    border: 1px solid #ff8447;
+    border-radius: 7px;
+}
+main #table_with_attributes tr.even, main #table_with_attributes tr.alt, main #table_with_attributes tr: nth-of-type(2n) {
+    background-color: hsl(20,100%,94%);
+}
+
+main form table #username, main form table #password {
+    margin-bottom: 0
+}
+main #regularsubmit {
+    display: none;
+}
+
+main #mobilesubmit {
+    display: block;
+    width: 100%;
+    margin: 0 auto;
+    padding: 0.1rem;
+    background: none repeat scroll 0% 0% #214BB4;
+    border: 2px solid #214BB4;
     font-weight: bold;
     border-radius: 10px;
-}
-button: hover, .button:hover {
-    background: none;
-    color: #214BB5;
+    color: #fff;
 }
 
-/* CUSTOM WIZARD*/
+/* wizard */
 .wizard > .steps .current a, .wizard > .steps .current a: hover, .wizard > .steps .current a:active {
     background: none repeat scroll 0% 0% #214BB5;
     color: #FFF;
@@ -70,7 +139,6 @@ button: hover, .button:hover {
     margin-left: auto;
     margin-right: auto;
 }
-
 .wizard > .actions a, .wizard > .actions a: active {
     text-decoration: none;
     background: #214BB5;
@@ -78,7 +146,6 @@ button: hover, .button:hover {
     font-weight: bold;
     border-radius: 10px;
 }
-
 .wizard > .actions a: hover {
     color: #214BB5;
     background: none;
@@ -86,19 +153,16 @@ button: hover, .button:hover {
     font-weight: bold;
     border-radius: 10px;
 }
-
 .wizard > .actions .disabled a, .wizard > .actions .disabled a: hover, .wizard > .actions .disabled a:active {
     background: none repeat scroll 0% 0% #9DC8E2;
     color: #fff;
     border: 2px solid #9DC8E2;
 }
-
 .wizard > .content > .body label[for="sp_entityid"] {
     display: block;
     margin-bottom: 0;
     font-weight: bold;
 }
-
 .wizard > .content > .body label.error {
     color: #fff;
     width: 100%;
@@ -111,8 +175,11 @@ button: hover, .button:hover {
     position: absolute;
     margin: 3rem auto;
 }
+.wizard .content div.radio_inline input[type="radio"] {
+    display: inline;
+}
 
-/* Accounts profile page*/
+/* Accounts profile */
 .accounts_profile {
     box-sizing: border-box;
     min-width: 30%;
@@ -121,24 +188,20 @@ button: hover, .button:hover {
     justify-content: space-between;
     align-items: stretch;
 }
-
 .accounts_profile > div.tbl {
     flex: 0 0 22em;
     display: block; /* IE fix */
     margin-right: 1em;
 }
-
 .accounts_profile div.tbl table {
     width: 100%;
     margin-top: 2rem;
     table-layout: fixed;
     word-wrap: break-word;
 }
-
 .accounts_profile div.tbl table tr th: nth-child(1) {
     width: 40%;
 }
-
 .accounts_profile div.tbl table tr: nth-child(3) div {
     display: flex;
     margin: 0;
@@ -153,13 +216,11 @@ button: hover, .button:hover {
     line-height: 1.3;
     text-align: left;
 }
-
 .show_account_details {
     margin-bottom: 0;
     padding: 0.5rem 1rem;
 }
 .accounts_profile table caption {
-
     background-color: #FF8547;
     color: #fff;
     padding: 0.2rem 0 0.2rem 1rem;
@@ -173,10 +234,6 @@ button: hover, .button:hover {
 fieldset.scrollable {
     height: 75%;
 }
-.wizard .content div.radio_inline input[type="radio"] {
-    display: inline;
-}
-
 .custom-combobox {
     position: relative;
     display: inline-block;
@@ -201,78 +258,3 @@ fieldset.scrollable {
     /* prevent horizontal scrollbar */
     overflow-x: hidden;
 }
-
-/*Global*/
-h1,h2,h3,h4,h5,h6 {
-    color: #214BB5;
-}
-h3 {
-    margin-top: 2rem;
-}
-
-/* Links */
-a, a: visited, a:active, a:link {
-    text-decoration: underline;
-}
-
-a: hover {
-    text-decoration: none;
-}
-
-/*simplesaml css*/
-main {
-    padding: 1rem 0.5rem;
-}
-
-main form {
-    width: 100%;
-    margin: 1rem;
-
-}
-main form table {
-    padding: 1rem;
-    margin: 1rem auto;
-    border: none;
-    border-radius: 7px;
-}
-main form table td {
-    color: #000!important;
-}
-
-main form table tr.even, main form table tr.alt, main form table tr: nth-of-type(2n) {
-    background: none!important;
-}
-
-main h2 {
-    font-size: 1.5rem;
-}
-
-main #table_with_attributes {
-    border: 1px solid #ff8447;
-    border-radius: 7px;
-}
-main #table_with_attributes tr.even, main #table_with_attributes tr.alt, main #table_with_attributes tr: nth-of-type(2n) {
-    background-color: hsl(20,100%,94%);
-}
-
-main form table #username, main form table #password {
-    margin-bottom: 0
-}
-main #regularsubmit {
-    display: none;
-}
-
-main #mobilesubmit {
-    display: block;
-    width: 100%;
-    margin: 0 auto;
-    padding: 0.1rem;
-    background: none repeat scroll 0% 0% #214BB4;
-    border: 2px solid #214BB4;
-    font-weight: bold;
-    border-radius: 10px;
-    color: #fff;
-}
-#languagebar {
-    font-size: 0.8rem;
-}