diff --git a/src/css/export.css b/src/css/export.css
index f85334737..7fe71ff18 100644
--- a/src/css/export.css
+++ b/src/css/export.css
@@ -241,3 +241,7 @@
     bottom: -450px;
     right: -22px;
 }
+
+.clear-repository-btn {
+    margin-right: 5px;
+}
diff --git a/src/pages/cluster-management/clusterInfo.html b/src/pages/cluster-management/clusterInfo.html
index d8b009a08..7ddac51cc 100644
--- a/src/pages/cluster-management/clusterInfo.html
+++ b/src/pages/cluster-management/clusterInfo.html
@@ -30,16 +30,16 @@ <h1>
                     tooltip-placement="bottom">
                 <span class="icon-trash"></span> {{'cluster_management.buttons.delete_cluster' | translate}}
             </button>
-            <button type="button" class="btn btn-primary add-node-btn" ng-if="currentLeader"
-                    ng-click="showAddNodeToClusterDialog()"
-                    gdb-tooltip="{{'cluster_management.buttons.add_nodes_btn_tooltip' | translate}}" tooltip-placement="bottom">
-                <span class="icon-plus"></span> {{'cluster_management.buttons.add_nodes_btn' | translate}}
-            </button>
-            <button type="button" class="btn btn-secondary remove-node-btn mr-2" ng-if="currentLeader"
+            <button type="button" class="btn btn-secondary remove-node-btn" ng-if="currentLeader"
                     ng-click="showRemoveNodesFromClusterDialog()"
                     gdb-tooltip="{{'cluster_management.buttons.remove_nodes_btn_tooltip' | translate}}" tooltip-placement="bottom">
                 <span class="icon-minus"></span> {{'cluster_management.buttons.remove_nodes_btn' | translate}}
             </button>
+            <button type="button" class="btn btn-primary add-node-btn mr-2" ng-if="currentLeader"
+                    ng-click="showAddNodeToClusterDialog()"
+                    gdb-tooltip="{{'cluster_management.buttons.add_nodes_btn_tooltip' | translate}}" tooltip-placement="bottom">
+                <span class="icon-plus"></span> {{'cluster_management.buttons.add_nodes_btn' | translate}}
+            </button>
         </div>
     </div>
     <button class="btn btn-link"
diff --git a/src/pages/export.html b/src/pages/export.html
index a7bc88bfd..3a0c32e89 100644
--- a/src/pages/export.html
+++ b/src/pages/export.html
@@ -49,26 +49,24 @@ <h1>
 					</label>
 				</div>
 
-
-
 				<div class="clearfix mb-2">
-					<div class="btn-group" uib-dropdown>
-						<button type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle>
-							<span class="icon-export"></span> {{'export.repository.label' | translate}}
-						</button>
-						<ul class="dropdown-menu">
-							<li ng-repeat="format in exportFormats" class="export-repo-format-{{format.name}}"
-								ng-click="exportRepo(format, false);">
-								<span class="dropdown-item">{{format.name}}</span>
-							</li>
-						</ul>
-					</div>
 					<button type="button" class="btn btn-secondary clear-repository-btn"
 							ng-click="dropRepository()"
 							gdb-tooltip="{{'removes.data.from.repo.label' | translate}}" tooltip-placement="top"
 							ng-disabled="!canWriteActiveRepo(true)">
 						<span class="icon-trash"></span> {{'clear.repo.label' | translate}}
 					</button>
+                    <div class="btn-group" uib-dropdown>
+                        <button type="button" class="btn btn-primary dropdown-toggle" uib-dropdown-toggle>
+                            <span class="icon-export"></span> {{'export.repository.label' | translate}}
+                        </button>
+                        <ul class="dropdown-menu">
+                            <li ng-repeat="format in exportFormats" class="export-repo-format-{{format.name}}"
+                                ng-click="exportRepo(format, false);">
+                                <span class="dropdown-item">{{format.name}}</span>
+                            </li>
+                        </ul>
+                    </div>
 					<div class="pull-right">
 						<div ng-show="pageSize >= filteredGraphs.length"></div>
                         <div paginations ng-hide="pageSize >= filteredGraphs.length"
diff --git a/src/pages/home.html b/src/pages/home.html
index bf5434e24..782d86530 100644
--- a/src/pages/home.html
+++ b/src/pages/home.html
@@ -17,8 +17,8 @@ <h1 class="card-title">{{page.title}}</h1>
                     </div>
                 </div>
                 <div class="card-block">
-                    <a href="guides" class="btn btn-lg btn-primary">{{'take.me.to.guides' | translate}}</a>
                     <a href="#" class="btn btn-lg btn-outline-secondary decline-tutorial" ng-click="declineTutorial()">{{'hide.panel' | translate}}</a>
+                    <a href="guides" class="btn btn-lg btn-primary">{{'take.me.to.guides' | translate}}</a>
                     <div class="btn-toolbar pull-right" role="toolbar" aria-label="Toolbar with button groups">
                         <div class="btn-group" role="group" aria-label="First group">
                             <button type="button" class="btn btn-secondary" ng-click="slideToPage($index)"
diff --git a/src/pages/licenseInfo.html b/src/pages/licenseInfo.html
index 6663ecd30..8cd5f3b6b 100644
--- a/src/pages/licenseInfo.html
+++ b/src/pages/licenseInfo.html
@@ -58,14 +58,14 @@ <h3 class="card-header">GraphDB {{getProductTypeHuman()}} {{'edition' | translat
                 </div>
             </div>
             <p class="text-muted">{{license.typeOfUse}}</p>
-            <div>
-                <a href="license/register" ng-if="!isLicenseHardcoded() && isAdmin()" class="btn btn-primary">
-                    {{'core.errors.set.new.license.warning.msg' | translate}}
-                </a>
+            <div class="text-right">
                 <button ng-click="revertToFree()" ng-if="!isLicenseHardcoded() && !isFreeEdition() && isAdmin()"
                         class="btn btn-secondary">
                     {{'revert.to.free' | translate}}
                 </button>
+                <a href="license/register" ng-if="!isLicenseHardcoded() && isAdmin()" class="btn btn-primary">
+                    {{'core.errors.set.new.license.warning.msg' | translate}}
+                </a>
             </div>
 
             <div class="mt-2" ng-if="isFreeEdition() || !getLicense().valid">
diff --git a/src/pages/login.html b/src/pages/login.html
index 2ae7e28aa..601f5f858 100644
--- a/src/pages/login.html
+++ b/src/pages/login.html
@@ -20,8 +20,7 @@ <h1>{{'view.login.title' | translate}}</h1>
 							<input id="wb-login-password" type="password" placeholder="{{'your.password.placeholder' | translate}}" ng-model="$parent.password" class="form-control form-control-lg" required ng-blur="wrongCredentials = false">
 						</div>
 					</div>
-					<div class="form-group">
-<!-- 					<a href="#" class="requestAccess">Request access</a> -->
+					<div class="form-group text-right">
 						<button id="wb-login-submitLogin" type="submit" class="btn btn-primary btn-lg">{{'sign.in' | translate}}</button>
 					</div>
 				</form>