diff --git a/src/main/webapp/activate.jsp b/src/main/webapp/activate.jsp
index 54f42fe..32b5974 100644
--- a/src/main/webapp/activate.jsp
+++ b/src/main/webapp/activate.jsp
@@ -47,18 +47,24 @@
         <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
         </div>
     </div>
-    <div class=" uk-section  uk-margin-small-top tm-middle custom-main-content" id="tm-main">
-        <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
+    <div class="tm-middle custom-main-content" id="tm-main">
+        <div class="uk-container uk-container-small uk-section  uk-margin-small-bottom uk-text-center">
             <div uk-grid="" class="uk-grid uk-grid-stack">
                 <div class="tm-main uk-width-1-2@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column uk-align-center">
                     <div class="uk-grid ">
                         <!-- CENTER SIDE -->
                         <div class="uk-width-1-1@m uk-width-1-1@s uk-text-center">
                             <div class="middle-box text-center loginscreen animated fadeInDown ">
-                                <p>Thank you for registering! Please activate your account. An email has been sent to your email address. The email contains your username and an activation code, please paste them in the fields below to prove that you are the owner of this email account.</p>
+                                <p>Thank you for registering! <br>
+                                    The next step is to <span class="uk-text-bold uk-text-primary">activate your account.</span><br><br>
+                                    An <span class="uk-text-bold">email</span> with your username and an <span class="uk-text-bold">activation code</span> has been sent to you. Please use them in the form below to activate your account.<br>
+                                    <span class="uk-text-bold">Note:</span> the activation code <span class="uk-text-warning">expires in 24 hours</span>.
+
+
+                                </p>
                                 <div class="uk-width-1-3@m uk-align-center">
                                     <!-- Validate form -->
-                                    <div id="registerForm">
+                                    <div id="registerForm" class="uk-padding">
                                         <form action="activate" method="POST" role="form" class="m-t" id="register_form">
                                             <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
                                             <div class="alert alert-success" aria-hidden="true" style="display: none;"></div>
@@ -75,7 +81,7 @@
                                                 <input id="verification_code" name="verification_code" type="text" placeholder="Activation Code" value="${param.code}" class="form-control"></div>
                                             <div class="uk-margin uk-grid-small uk-child-width-auto uk-grid uk-text-left uk-grid-stack" uk-grid="">
                                                 <div class="uk-width-1-1 uk-grid-margin uk-first-column">
-                                                    <button type="submit" class="uk-button uk-button-primary" onclick="return validateForm();">Submit</button>
+                                                    <button type="submit" class="uk-button uk-button-primary" onclick="return validateForm();">Activate account</button>
                                                 </div>
                                             </div>
                                         </form>
diff --git a/src/main/webapp/addPassword.jsp b/src/main/webapp/addPassword.jsp
index cfb6609..189e065 100644
--- a/src/main/webapp/addPassword.jsp
+++ b/src/main/webapp/addPassword.jsp
@@ -55,7 +55,7 @@
         </div>
     </div>
     <div class=" uk-section  uk-margin-small-top tm-middle custom-main-content" id="tm-main">
-        <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
+        <div class="uk-container uk-container-small uk-margin-small-bottom uk-text-center">
             <div uk-grid="" class="uk-grid uk-grid-stack">
                 <div class="tm-main uk-width-1-2@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column uk-align-center">
                     <div class="uk-grid ">
diff --git a/src/main/webapp/editRegisteredService.jsp b/src/main/webapp/editRegisteredService.jsp
index 3d974cb..eeb00c6 100644
--- a/src/main/webapp/editRegisteredService.jsp
+++ b/src/main/webapp/editRegisteredService.jsp
@@ -32,6 +32,32 @@
                         <img alt="OpenAIRE" class="uk-responsive-height" src="./images/Logo_Horizontal.png">
                     </div>
                 </div>
+                <!-- user menu -->
+                <div class=uk-navbar-right>
+                    <ul class="uk-navbar-nav user_actions">
+                        <li><a href="#"> Sign in </a></li>
+                        <li>
+                            <a class="login uk-icon" aria-expanded="false">
+                                <svg height="60" width="60"><circle cx="30" cy="30" r="20" stroke-width="2"></circle>
+                                    <text dy=".4em" font-size="16" text-anchor="middle" x="50%" y="50%"> AK </text></svg>
+                            </a>
+                            <div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-right" id="userMenu" style="left: 344.433px; top: 100px;">
+                                <div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
+                                    <div class="uk-first-column uk-height-max-medium uk-overflow-auto">
+                                        <ul class="uk-nav uk-navbar-dropdown-nav">
+                                            <li class=""><a href="./personalToken">Personal token</a></li>
+                                            <li class=""><a href="./registeredServices">Registered services</a></li>
+                                            <li class="uk-nav-divider "></li>
+                                            <li>
+                                                <a id="logout">Log out</a>
+                                            </li>
+                                        </ul>
+                                    </div>
+                                </div>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
             </nav>
         </div>
     </div>
@@ -41,14 +67,22 @@
         <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
         </div>
     </div>
-    <div class=" uk-section  uk-margin-small-top tm-middle custom-main-content" id="tm-main">
-        <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
-            <h2 class="uk-h2 uk-margin-small-bottom">Update your service</h2>
-                <div class="tm-main uk-width-2-3@s uk-width-2-3@m  uk-width-3-4@l uk-row-first uk-first-column uk-align-center">
-                    <div class="uk-grid ">
-                        <!-- CENTER SIDE -->
-                        <div class="uk-width-1-1@m uk-width-1-1@s uk-text-center">
-                            <h5 class="uk-h5">Please fill in the updated values for your service</h5>
+    <div class=" uk-section  uk-margin-small-top uk-container uk-container-large" id="tm-main">
+        <div class="uk-grid ">
+            <div class="uk-width-1-4@m">
+                <div  class="uk-card uk-card-default uk-card-body">
+                    <div class="uk-h4">Sidebar title</div>
+                    <ul class="uk-nav uk-nav-default">
+                        <li class=""><a href="./personalToken">Personal token</a></li>
+                        <li class=""><a href="./registeredServices">Registered services</a></li>
+                    </ul>
+                </div>
+            </div>
+            <!-- CENTER SIDE -->
+            <div class="uk-width-2-3@l uk-width-2-3@m">
+
+                <h2 class="uk-h2 uk-margin-small-bottom">Edit service</h2>
+                <h3 class="uk-h4">Please fill in the updated values for your service</h3>
                             <div class="middle-box text-center loginscreen animated fadeInDown ">
                                 <div class="k-width-1-1@m uk-width-1-1@s uk-text-center">
                                     <!-- REGISTER FORM -->
@@ -99,11 +133,8 @@
                                 </div>
                                 </ul>
                             </div>
-                        </div>
-                        <!-- END OF CENTER SIDE -->
-                    </div>
-                </div>
             </div>
+            <!-- END OF CENTER SIDE -->
         </div>
     </div>
     <!-- CONTENT ENDS HERE -->
diff --git a/src/main/webapp/emailSuccess.jsp b/src/main/webapp/emailSuccess.jsp
index 9d19dba..0fe842a 100644
--- a/src/main/webapp/emailSuccess.jsp
+++ b/src/main/webapp/emailSuccess.jsp
@@ -54,8 +54,8 @@
         <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
         </div>
     </div>
-    <div class=" uk-section  uk-margin-small-top tm-middle custom-main-content" id="tm-main">
-        <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
+    <div class=" uk-section   tm-middle custom-main-content" id="tm-main">
+        <div class="uk-container uk-container-small   uk-margin-small-bottom uk-text-center">
             <%--<h2 class="uk-h2 uk-margin-small-bottom">Forgot Password</h2>--%>
             <div uk-grid="" class="uk-grid uk-grid-stack">
                 <div class="tm-main uk-width-1-2@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column uk-align-center">
diff --git a/src/main/webapp/error.jsp b/src/main/webapp/error.jsp
index 1063a38..44ed206 100644
--- a/src/main/webapp/error.jsp
+++ b/src/main/webapp/error.jsp
@@ -56,7 +56,7 @@
             <%--<div class="uk-text-meta uk-margin-large-bottom">Use the same credentials for all our services</div>--%>
             <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column">
                 <div class="uk-width-1-1">
-                    <h3 class="uk-h3 uk-text-danger">Oops! Something went wrong!</h3>
+                    <h3 class="uk-h4 uk-text-danger">Oops! Something went wrong!</h3>
                     <div class="middle-box loginscreen animated fadeInDown uk-text-left ">
                         <p>Something went wrong. Please try again later or contact OpenAIRE <a href="https://www.openaire.eu/support/helpdesk">helpdesk</a>. We apologize for the inconvenience.</p>
                     </div>
diff --git a/src/main/webapp/error404.jsp b/src/main/webapp/error404.jsp
index bfee453..3fb0646 100644
--- a/src/main/webapp/error404.jsp
+++ b/src/main/webapp/error404.jsp
@@ -42,7 +42,7 @@
             <%--<div class="uk-text-meta uk-margin-large-bottom">Use the same credentials for all our services</div>--%>
             <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column">
                 <div class="uk-width-1-1">
-                    <h3 class="uk-h3 uk-text-danger ">404 - Oops! Something went wrong!</h3>
+                    <h3 class="uk-h4 uk-text-danger ">404 - Oops! Something went wrong!</h3>
                     <div class="middle-box loginscreen animated fadeInDown uk-text-left ">
                         <p class="uk-text-center">404 Error! The requested page was not found.</p>
                     </div>
diff --git a/src/main/webapp/expiredVerificationCode.jsp b/src/main/webapp/expiredVerificationCode.jsp
index 2cfc3ec..131065b 100644
--- a/src/main/webapp/expiredVerificationCode.jsp
+++ b/src/main/webapp/expiredVerificationCode.jsp
@@ -50,15 +50,15 @@
         <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid">
         </div>
     </div>
-    <div class=" uk-section uk-margin-small-top tm-middle custom-main-content" id="tm-main">
-        <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
+    <div class=" uk-section   tm-middle custom-main-content" id="tm-main">
+        <div class="uk-container uk-container-small  uk-margin-small-bottom uk-text-center">
             <%--<h2 class="uk-h2 uk-margin-small-bottom">Welcome to our Single Sign-On service</h2>--%>
             <%--<div class="uk-text-meta uk-margin-large-bottom">Use the same credentials for all our services</div>--%>
             <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column">
                 <div class="uk-width-1-1">
                     <%--<h3 class="uk-h3 uk-text-danger">Oops! Something went wrong</h3>--%>
                     <div class="middle-box loginscreen animated fadeInDown uk-text-center">
-                        <p>Your verification code has expired. Please request for a new verification code <a href="http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/forgotPassword.jsp">here</a>.</p>
+                        <p>Your verification code has expired. Please request for a new verification code <a href="./requestActivationCode.jsp">here</a>.</p>
                     </div>
                 </div>
 
diff --git a/src/main/webapp/forgotPassword.jsp b/src/main/webapp/forgotPassword.jsp
index 881af7f..10e4e2f 100644
--- a/src/main/webapp/forgotPassword.jsp
+++ b/src/main/webapp/forgotPassword.jsp
@@ -38,8 +38,8 @@
       <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
       </div>
     </div>
-    <div class=" uk-section  uk-margin-small-top tm-middle custom-main-content" id="tm-main">
-      <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
+    <div class=" uk-section tm-middle custom-main-content" id="tm-main">
+      <div class="uk-container uk-container-small uk-margin-small-bottom uk-text-center">
         <h2 class="uk-h2 uk-margin-small-bottom">Forgot Password</h2>  
         <div uk-grid="" class="uk-grid uk-grid-stack">
           <div class="tm-main uk-width-1-2@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column uk-align-center">
diff --git a/src/main/webapp/overview.jsp b/src/main/webapp/overview.jsp
index d4a4f8c..7869fde 100644
--- a/src/main/webapp/overview.jsp
+++ b/src/main/webapp/overview.jsp
@@ -14,7 +14,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <base href=".">
-    <title>OpenAIRE - Register</title>
+    <title>OpenAIRE - APIs Authentication</title>
     <script src="./js/jquery.js"></script>
     <script src="./js/uikit.js"></script>
     <script src="./js/validation.js"></script>
@@ -91,15 +91,20 @@
                 To achieve better rate limits you need to make authenticated requests. We support personal access tokens and service registration.
                 For more information please read the <a href="">documentation.</a>
             </div>
-            <div class="uk-grid uk-child-width-1-3@m uk-child-width-1-1@s uk-margin-top uk-text-left uk-container uk-container-small uk-margin-auto">
-                <div class="uk-card uk-card-default uk-card-body">
-                    <div class=""> <a class="uk-link uk-text-large" href="./personalToken"> Personal token</a></div>
-                    <div>Access the OpenAIRE APIs with your personal access token.</div>
+            <div class="uk-grid uk-child-width-1-2@m uk-child-width-1-1@s uk-margin-top uk-text-left uk-container uk-container-small uk-margin-auto">
+                <div class="uk-padding-small">
+                    <div class="uk-card uk-card-default uk-card-body">
+                        <div class=""> <a class="uk-link uk-text-large" href="./personalToken"> Personal token</a></div>
+                        <div>mpla mpla mpla</div>
 
+
+                    </div>
                 </div>
-                <div class="uk-card uk-card-default uk-card-body uk-margin-left">
-                    <div class=""> <a class="uk-link uk-text-large" href="./registeredServices"> Registered Services</a></div>
-                    <div>Register your service to enable requests to the OpenAIRE APIs.</div>
+                <div class="uk-padding-small">
+                    <div class="uk-card uk-card-default uk-card-body ">
+                        <div class=""> <a class="uk-link uk-text-large" href="./registeredServices"> Registered Services</a></div>
+                        <div>mpla mpla mpla</div>
+                    </div>
                 </div>
             </div>
 
diff --git a/src/main/webapp/personal.jsp b/src/main/webapp/personal.jsp
index a0a9fd2..4bc2c38 100644
--- a/src/main/webapp/personal.jsp
+++ b/src/main/webapp/personal.jsp
@@ -5,9 +5,33 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>OpenAIRE - Forgot password</title>
+  <title>OpenAIRE - Personal token</title>
   <script src="./js/jquery.js"></script>
   <script src="./js/uikit.js"></script>
+  <script src="./js/uikit-icons-max.js"></script>
+  <script>
+    function copy(id) {
+      var element = document.getElementById(id);
+      if (document.body.createTextRange) {
+        range = document.body.createTextRange();
+        range.moveToElementText(element);
+        range.select();
+      } else if (window.getSelection) {
+        selection = window.getSelection();
+        range = document.createRange();
+        range.selectNodeContents(element);
+        selection.removeAllRanges();
+        selection.addRange(range);
+      }
+      try {
+        document.execCommand('copy');
+        UIkit.notification({message: 'Copied to clipboard!', status: 'primary', pos: 'top-right'});
+      }
+      catch (err) {
+        console.error('unable to copy text');
+      }
+    }
+  </script>
   <link rel="stylesheet" style="text/css" href="./css/theme.css">
   <link rel="stylesheet" style="text/css" href="./css/custom.css">
   <link rel="stylesheet" style="text/css" href="./css/aai-custom.css">
@@ -90,23 +114,31 @@
         </div>
         <!-- CENTER SIDE -->
         <div class="uk-width-2-3@l uk-width-2-3@m">
-          <p>
-          Your personal access token is
-          <pre><code>${accessToken}</code></pre>
-          </p>
+          <div>
+            <a  class=" uk-text-danger uk-float-right" title="Revoke access token"><span uk-icon="refresh" ></span></a>
+            <a class=" uk-float-right uk-margin-small-left" onclick="copy('accessToken')" title="Copy access token"><span uk-icon="icon:copy"></span></a>
+            <div class="uk-h5">Your personal access token is</div>
+            <pre><code id="accessToken">${accessToken}</code></pre>
+          </div>
+          <div>
+            <a  class=" uk-text-danger uk-float-right" title="Revoke refresh token"><span uk-icon="refresh"></span></a>
+            <a class="  uk-float-right uk-margin-small-left"  onclick="copy('refreshToken')" title="Copy refresh token"><span uk-icon="icon: copy"></span></a>
+            <div class="uk-h5">Your refresh token is</div>
+          <pre><code id="refreshToken">${refreshToken}</code></pre>
+          </div>
 
-          <p>
-          Your refresh token is
-          <pre><code>${refreshToken}</code></pre>
-          </p>
-
-          <div class="uk-alert-danger uk-alert" >
+          <div class="uk-alert-danger uk-alert uk-margin-large-top" >
                 <p><b>Do not share your personal access token. Send your personal access token only over HTTPS.</b></p>
           </div>
 
           <div class="uk-alert-primary uk-alert" >
               For further information on how to use the tokens please visit the <a href="">OpenAIRE API Authentication documentation</a>.
           </div>
+          <div>
+            <div class="uk-h5">Revoke tokens</div>
+            <div>Mpla mpla mpla</div>
+            <a  class="uk-button uk-button-danger uk-margin-top"><span uk-icon="refresh"></span>Revoke</a>
+          </div>
         </div>
         <!-- END OF CENTER SIDE -->
       </div>
diff --git a/src/main/webapp/register.jsp b/src/main/webapp/register.jsp
index df78061..2d1e0bd 100644
--- a/src/main/webapp/register.jsp
+++ b/src/main/webapp/register.jsp
@@ -49,15 +49,15 @@
         <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
         </div>
     </div>
-    <div class=" uk-section  uk-margin-small-top tm-middle custom-main-content" id="tm-main">
-        <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
+    <div class=" uk-section tm-middle custom-main-content" id="tm-main">
+        <div class="uk-container uk-container-small uk-margin-small-bottom uk-text-center">
             <h2 class="uk-h2 uk-margin-small-bottom">Create new OpenAIRE account</h2>
             <%--<div class="uk-text-meta uk-margin-large-bottom">Use the same credentials for all our services</div>--%>
                 <div class="tm-main uk-width-1-1@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column">
                     <div class="uk-grid ">
                         <!-- CENTER SIDE -->
                         <div class="uk-width-1-1@m uk-width-1-1@s uk-text-center">
-                            <h3 class="uk-h3">Create an account</h3>
+                            <h3 class="uk-h4">Create an account</h3>
                             <div class="middle-box text-center loginscreen animated fadeInDown ">
                                 <div class="uk-width-1-3@m uk-align-center">
                                     <!-- REGISTER FORM -->
diff --git a/src/main/webapp/registerSuccess.jsp b/src/main/webapp/registerSuccess.jsp
index 0df5f91..ab6fa6d 100644
--- a/src/main/webapp/registerSuccess.jsp
+++ b/src/main/webapp/registerSuccess.jsp
@@ -54,8 +54,8 @@
         <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
         </div>
     </div>
-    <div class=" uk-section  uk-margin-small-top tm-middle custom-main-content" id="tm-main">
-        <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
+    <div class=" uk-section tm-middle custom-main-content" id="tm-main">
+        <div class="uk-container uk-container-small  uk-margin-small-bottom uk-text-center">
             <%--<h2 class="uk-h2 uk-margin-small-bottom">Forgot Password</h2>--%>
             <div uk-grid="" class="uk-grid uk-grid-stack">
                 <div class="tm-main uk-width-1-2@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column uk-align-center">
diff --git a/src/main/webapp/registeredServices.jsp b/src/main/webapp/registeredServices.jsp
index e6e3391..8e74ff8 100644
--- a/src/main/webapp/registeredServices.jsp
+++ b/src/main/webapp/registeredServices.jsp
@@ -118,6 +118,7 @@
                                     </div>
                                     <div>${registeredService.date}</div>
                                     <div>
+
                                         <a href="./editRegisteredService?id=${registeredService.id}"><span class="uk-margin-small-right" uk-icon="pencil" ></span>
                                         <span class="uk-margin-small-right uk-text-danger" uk-icon="trash" uk-toggle="target: #modal1"></span>
 
@@ -151,8 +152,8 @@
                                     </div>
                                     <div>last year</div>
                                     <div>
-                                        <span class="uk-margin-small-right" uk-icon="pencil"></span>
-                                        <span class="uk-margin-small-right uk-text-danger" uk-icon="trash" uk-toggle="target: #modal1"></span>
+                                        <a class="uk-margin-small-right" uk-icon="pencil" href="./editRegisterService"></a>
+                                        <a class="uk-margin-small-right uk-text-danger" uk-icon="trash" uk-toggle="target: #modal1"></a>
                                     </div>
                                 </div>
                             </li>
diff --git a/src/main/webapp/remindUsername.jsp b/src/main/webapp/remindUsername.jsp
index 028cfce..dcfde43 100644
--- a/src/main/webapp/remindUsername.jsp
+++ b/src/main/webapp/remindUsername.jsp
@@ -39,8 +39,8 @@
       <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
       </div>
     </div>
-    <div class=" uk-section  uk-margin-small-top tm-middle custom-main-content" id="tm-main">
-      <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
+    <div class=" uk-section tm-middle custom-main-content" id="tm-main">
+      <div class="uk-container uk-container-small uk-margin-small-bottom uk-text-center">
         <h2 class="uk-h2 uk-margin-small-bottom">Forgot username</h2>
         <div uk-grid="" class="uk-grid uk-grid-stack">
           <div class="tm-main uk-width-1-2@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column uk-align-center">
diff --git a/src/main/webapp/requestActivationCode.jsp b/src/main/webapp/requestActivationCode.jsp
index b6995da..dc8a9e8 100644
--- a/src/main/webapp/requestActivationCode.jsp
+++ b/src/main/webapp/requestActivationCode.jsp
@@ -46,8 +46,8 @@
             <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
             </div>
         </div>
-        <div class=" uk-section  uk-margin-small-top tm-middle custom-main-content" id="tm-main">
-            <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
+        <div class=" uk-section tm-middle custom-main-content" id="tm-main">
+            <div class="uk-container uk-container-small uk-margin-small-bottom uk-text-center">
                 <h2 class="uk-h2 uk-margin-small-bottom">Request an activation code</h2>
                 <div uk-grid="" class="uk-grid uk-grid-stack">
                     <div class="tm-main uk-width-1-2@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column uk-align-center">
diff --git a/src/main/webapp/requestToDeleteAccount.jsp b/src/main/webapp/requestToDeleteAccount.jsp
index c596867..03aa42e 100644
--- a/src/main/webapp/requestToDeleteAccount.jsp
+++ b/src/main/webapp/requestToDeleteAccount.jsp
@@ -47,8 +47,8 @@
         <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
         </div>
     </div>
-    <div class=" uk-section  uk-margin-small-top tm-middle custom-main-content" id="tm-main">
-        <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
+    <div class=" uk-section tm-middle custom-main-content" id="tm-main">
+        <div class="uk-container uk-container-small  uk-margin-small-bottom uk-text-center">
             <h2 class="uk-h2 uk-margin-small-bottom">Request to delete your account</h2>
             <div uk-grid="" class="uk-grid uk-grid-stack">
                 <div class="tm-main uk-width-1-2@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column uk-align-center">
diff --git a/src/main/webapp/resetPassword.jsp b/src/main/webapp/resetPassword.jsp
index 21ff944..5fbe502 100644
--- a/src/main/webapp/resetPassword.jsp
+++ b/src/main/webapp/resetPassword.jsp
@@ -46,8 +46,8 @@
       <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
       </div>
     </div>
-    <div class=" uk-section  uk-margin-small-top tm-middle custom-main-content" id="tm-main">
-      <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
+    <div class=" uk-section tm-middle custom-main-content" id="tm-main">
+      <div class="uk-container uk-container-small uk-margin-small-bottom uk-text-center">
         <div uk-grid="" class="uk-grid uk-grid-stack">
           <div class="tm-main uk-width-1-2@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column uk-align-center">
             <div class="uk-grid ">
diff --git a/src/main/webapp/success.jsp b/src/main/webapp/success.jsp
index cc7afd4..31c0575 100644
--- a/src/main/webapp/success.jsp
+++ b/src/main/webapp/success.jsp
@@ -57,8 +57,8 @@
         <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
         </div>
     </div>
-    <div class=" uk-section  uk-margin-small-top tm-middle custom-main-content" id="tm-main">
-        <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
+    <div class=" uk-section tm-middle custom-main-content" id="tm-main">
+        <div class="uk-container uk-container-small uk-margin-small-bottom uk-text-center">
             <%--<h2 class="uk-h2 uk-margin-small-bottom">Forgot Password</h2>--%>
             <div uk-grid="" class="uk-grid uk-grid-stack">
                 <div class="tm-main uk-width-1-2@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column uk-align-center">
diff --git a/src/main/webapp/successAddPassword.jsp b/src/main/webapp/successAddPassword.jsp
index 47acf7f..bce09a6 100644
--- a/src/main/webapp/successAddPassword.jsp
+++ b/src/main/webapp/successAddPassword.jsp
@@ -56,8 +56,8 @@
         <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
         </div>
     </div>
-    <div class=" uk-section  uk-margin-small-top tm-middle custom-main-content" id="tm-main">
-        <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
+    <div class=" uk-section  tm-middle custom-main-content" id="tm-main">
+        <div class="uk-container uk-container-small uk-margin-small-bottom uk-text-center">
             <%--<h2 class="uk-h2 uk-margin-small-bottom">Forgot Password</h2>--%>
             <div uk-grid="" class="uk-grid uk-grid-stack">
                 <div class="tm-main uk-width-1-2@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column uk-align-center">
diff --git a/src/main/webapp/successDeleteAccount.jsp b/src/main/webapp/successDeleteAccount.jsp
index 361d29a..dcbaf30 100644
--- a/src/main/webapp/successDeleteAccount.jsp
+++ b/src/main/webapp/successDeleteAccount.jsp
@@ -53,8 +53,8 @@
         <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
         </div>
     </div>
-    <div class=" uk-section  uk-margin-small-top tm-middle custom-main-content" id="tm-main">
-        <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
+    <div class=" uk-section    tm-middle custom-main-content" id="tm-main">
+        <div class="uk-container uk-container-small  uk-margin-small-bottom uk-text-center">
             <%--<h2 class="uk-h2 uk-margin-small-bottom">Forgot Password</h2>--%>
             <div uk-grid="" class="uk-grid uk-grid-stack">
                 <div class="tm-main uk-width-1-2@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column uk-align-center">
diff --git a/src/main/webapp/verify.jsp b/src/main/webapp/verify.jsp
index 8c0af58..739be4f 100644
--- a/src/main/webapp/verify.jsp
+++ b/src/main/webapp/verify.jsp
@@ -39,8 +39,8 @@
       <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
       </div>
     </div>
-    <div class=" uk-section  uk-margin-small-top tm-middle custom-main-content" id="tm-main">
-      <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
+    <div class=" uk-section   tm-middle custom-main-content" id="tm-main">
+      <div class="uk-container uk-container-small  uk-margin-small-bottom uk-text-center">
         <div uk-grid="" class="uk-grid uk-grid-stack">
           <div class="tm-main uk-width-1-2@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column uk-align-center">
             <div class="uk-grid ">
diff --git a/src/main/webapp/verifyEmail.jsp b/src/main/webapp/verifyEmail.jsp
index d0c9851..f901900 100644
--- a/src/main/webapp/verifyEmail.jsp
+++ b/src/main/webapp/verifyEmail.jsp
@@ -47,8 +47,8 @@
         <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
         </div>
     </div>
-    <div class=" uk-section  uk-margin-small-top tm-middle custom-main-content" id="tm-main">
-        <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
+    <div class=" uk-section  tm-middle custom-main-content" id="tm-main">
+        <div class="uk-container uk-container-small  uk-margin-small-bottom uk-text-center">
             <div uk-grid="" class="uk-grid uk-grid-stack">
                 <div class="tm-main uk-width-1-2@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column uk-align-center">
                     <div class="uk-grid ">
diff --git a/src/main/webapp/verifyToDelete.jsp b/src/main/webapp/verifyToDelete.jsp
index a124014..779b0c0 100644
--- a/src/main/webapp/verifyToDelete.jsp
+++ b/src/main/webapp/verifyToDelete.jsp
@@ -46,8 +46,8 @@
         <div class="first_page_banner_headline uk-grid-collapse uk-flex-middle uk-margin-remove-vertical uk-grid" uk-grid="">
         </div>
     </div>
-    <div class=" uk-section  uk-margin-small-top tm-middle custom-main-content" id="tm-main">
-        <div class="uk-container uk-container-small uk-margin-medium-top  uk-margin-small-bottom uk-text-center">
+    <div class=" uk-section tm-middle custom-main-content" id="tm-main">
+        <div class="uk-container uk-container-small uk-margin-small-bottom uk-text-center">
             <div uk-grid="" class="uk-grid uk-grid-stack">
                 <div class="tm-main uk-width-1-2@s uk-width-1-1@m  uk-width-1-1@l uk-row-first uk-first-column uk-align-center">
                     <div class="uk-grid ">