diff --git a/src/base.html b/src/base.html
index 3e3eefba5..f563de838 100644
--- a/src/base.html
+++ b/src/base.html
@@ -166,6 +166,12 @@
       <link rel="manifest" href="{{ config.extra.manifest | url }}">
     {% endif %}
 
+    <!-- FontAwesome for social links -->
+    {% if config.extra.social %}
+      <link rel="stylesheet" type="text/css"
+          href="{{ 'assets/fonts/font-awesome.css' | url }}" />
+    {% endif %}
+
     <!-- Custom stylesheets -->
     {% for path in config["extra_css"] %}
       <link rel="stylesheet" type="text/css" href="{{ path | url }}" />
@@ -238,7 +244,7 @@
     {% endblock %}
 
     <!-- Container, necessary for web-application context -->
-    <div class="md-container">
+    <div class="md-container" data-md-component="container">
 
       <!-- Hero teaser -->
       {% block hero %}
@@ -254,7 +260,7 @@
 
       <!-- Main container -->
       <main class="md-main" role="main">
-        <div class="md-main__inner md-grid" data-md-component="container">
+        <div class="md-main__inner md-grid" data-md-component="main">
 
           <!-- Navigation -->
           {% block site_nav %}
diff --git a/src/partials/social.html b/src/partials/social.html
index 97fc14b79..20a8bd07b 100644
--- a/src/partials/social.html
+++ b/src/partials/social.html
@@ -23,8 +23,6 @@
 <!-- Social links in footer -->
 {% if config.extra.social %}
   <div class="md-footer-social">
-    <link rel="stylesheet" type="text/css"
-        href="{{ 'assets/fonts/font-awesome.css' | url }}" />
     {% for social in config.extra.social %}
       <a href="{{ social.link }}" class="md-footer-social__link
             fa fa-{{ social.type }}"></a>