diff --git a/config.rb b/config.rb
index c696659..9cc61f0 100644
--- a/config.rb
+++ b/config.rb
@@ -1,5 +1,3 @@
-require './lib/redcarpet_header_fix'
-
 set :css_dir, 'stylesheets'
 
 set :js_dir, 'javascripts'
diff --git a/lib/redcarpet_header_fix.rb b/lib/redcarpet_header_fix.rb
deleted file mode 100644
index 72883ce..0000000
--- a/lib/redcarpet_header_fix.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module RedcarpetHeaderFix
-  def header(text, level)
-    clean_id = text.downcase.gsub(/( +|\.+)/, '-').gsub(/[^a-zA-Z0-9\-_]/, '')
-    "<h#{level} id='#{clean_id}'>#{text}</h#{level}>"
-  end
-end
-
-require 'middleman-core/renderers/redcarpet'
-Middleman::Renderers::MiddlemanRedcarpetHTML.send :include, RedcarpetHeaderFix
diff --git a/source/javascripts/app/lang.js b/source/javascripts/app/lang.js
index c59a16b..90a31b9 100644
--- a/source/javascripts/app/lang.js
+++ b/source/javascripts/app/lang.js
@@ -26,9 +26,9 @@ under the License.
     $(".lang-selector a").removeClass('active');
     $(".lang-selector a[data-language-name='" + language + "']").addClass('active');
     for (var i=0; i < languages.length; i++) {
-      $(".highlight." + languages[i]).hide();
+      $(".highlight." + languages[i]).parent().hide();
     }
-    $(".highlight." + language).show();
+    $(".highlight." + language).parent().show();
 
     global.toc.calculateHeights();
 
diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss
index 6880e1b..d64b323 100644
--- a/source/stylesheets/screen.css.scss
+++ b/source/stylesheets/screen.css.scss
@@ -307,8 +307,9 @@ html, body {
     text-decoration: none;
     padding: 0 10px;
     line-height: 30px;
+    outline: 0;
 
-    &:active {
+    &:active, &:focus {
       background-color: $lang-select-pressed-bg;
       color: $lang-select-pressed-text;
     }