3 files changed, 16 insertions, 15 deletions
diff --git a/client/components/main/layouts.styl b/client/components/main/layouts.styl
index 65239cd6..87133391 100644
--- a/client/components/main/layouts.styl
+++ b/client/components/main/layouts.styl
@@ -28,6 +28,9 @@ body
   flex: 1
   overflow: hidden
 
+  .sk-spinner
+    margin-top: 30vh
+
 #modal
   position: absolute
   top: 0
@@ -267,7 +270,7 @@ dd
 .fa.fa-lock.colorful
   color: #f44336
 
-.pop-over .pop-over-list li a:hover
+.pop-over .pop-over-list li a:not(.disabled):hover
   .fa, .fa.colorful
     color: white
 
@@ -278,7 +281,7 @@ a
   &.fa, i.fa
     color: darken(white, 35%)
 
-  &:hover, &.is-active
+  &:not(.disabled):hover, &:not(.disabled).is-active
     &.fa, i.fa
       color: darken(white, 60%)
 
diff --git a/client/components/main/popup.styl b/client/components/main/popup.styl
index e44bb5c6..3bef4f7d 100644
--- a/client/components/main/popup.styl
+++ b/client/components/main/popup.styl
@@ -120,6 +120,9 @@ $popupWidth = 300px
     .at-result
       background: #b2dfdb
 
+  .sk-spinner
+    margin: 40px auto
+
   for depth in (1..6)
     .popup-container-depth-{depth}
       transform: translateX(- depth * $popupWidth)
@@ -133,7 +136,7 @@ $popupWidth = 300px
     cursor: pointer
     display: block
     font-weight: 700
-    padding: 0px 10px
+    padding: 1.5px 10px
     position: relative
     margin: 0 -10px
     text-decoration: none
@@ -145,7 +148,7 @@ $popupWidth = 300px
       width: auto
       padding-right: 22px
 
-    &:hover
+    &:not(.disabled):hover
       background-color: #005377
       color: #fff
 
@@ -162,7 +165,6 @@ $popupWidth = 300px
       font-size: 12px
       font-weight: 400
       line-height: 15px
-      margin-top: 4px
 
     &.current
       background-color: #e2e6e9
diff --git a/client/components/main/spinner.styl b/client/components/main/spinner.styl
index f4b8cc86..b211cf35 100644
--- a/client/components/main/spinner.styl
+++ b/client/components/main/spinner.styl
@@ -13,16 +13,12 @@
  *
  */
 
-.sk-spinner-wave {
-
-  &.sk-spinner {
-    width: 50px;
-    height: 50px;
-    margin: auto;
-    margin-top: 30vh;
-    text-align: center;
-    font-size: 10px;
-  }
+.sk-spinner {
+  width: 50px;
+  height: 50px;
+  margin: auto;
+  text-align: center;
+  font-size: 10px;
 
   div {
     background-color: #333;