diff --git a/client/less/map.less b/client/less/map.less
index 4788375f2d..a8633661dc 100644
--- a/client/less/map.less
+++ b/client/less/map.less
@@ -91,16 +91,15 @@
 
 .map-buttons {
   margin-top: -10px;
-}
-.map-buttons button,
-.map-buttons .input-group{
-  width:300px;
-}
-
-.map-buttons .input-group{
-  margin-top: 15px;
-  margin-left: auto;
-  margin-right: auto;
+  & button,
+  & .input-group{
+    width:300px;
+  }
+  .input-group{
+    margin-top: 15px;
+    margin-left: auto;
+    margin-right: auto;
+  }
 }
 
 #map-filter {
@@ -134,6 +133,14 @@
   #nested {
     margin:0 15px;
   }
+  a:focus {
+      text-decoration: none;
+      color:darkgreen;
+  }
+  a:focus:hover {
+      text-decoration: underline;
+      color:#001800;
+  }
   h2 > a {
       width:100%;
       display:block;
@@ -156,15 +163,16 @@
     }
   }
 
-  div.chapterBlock :before {
-    margin-right: 15px;
-  }
-
-  div.chapterBlock p {
+  div.chapterBlock {
+    :before {
+      margin-right: 15px;
+    }
+    p {
       text-indent: -15px;
       margin-left: 60px;
       padding-right: 20px
     }
+  }  
 
   .challengeBlockDescription {
       margin:0;
diff --git a/client/main.js b/client/main.js
index 3b5c2f4148..1e6bc8c99c 100644
--- a/client/main.js
+++ b/client/main.js
@@ -312,7 +312,7 @@ $(document).ready(function() {
     if ($(div).find('.manip-hidden').length ===
         $(div).find('p').length) {
       collapseBlock(div);
-      $(div).find('h3 > a').addClass('faded');
+      $(div).prev('h3').addClass('faded');
       $(div).prev('h2').addClass('faded');
     }
   });