diff --git a/sphinx_pythia_theme/layout.html b/sphinx_pythia_theme/layout.html
index 52fc3a5..97f993a 100644
--- a/sphinx_pythia_theme/layout.html
+++ b/sphinx_pythia_theme/layout.html
@@ -14,7 +14,11 @@
     </nav>
     {%- endblock %}
 
+    {%- if theme_page_layouts and pagename in theme_page_layouts %}
     <div class="container-fluid">
+    {%- else %}
+    <div class="container-xl">
+    {%- endif %}
       <div class="row">
         {%- block docs_sidebar %}
         {%- if sidebars %}
diff --git a/sphinx_pythia_theme/topbar.html b/sphinx_pythia_theme/topbar.html
deleted file mode 100644
index 5020e15..0000000
--- a/sphinx_pythia_theme/topbar.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="topbar container-fluid fixed-top">
-  <div class="topbar-contents row">
-    <div class="col-12 col-md-3 bd-topbar-whitespace site-navigation show"></div>
-    <div class="col pl-md-4 topbar-main">
-      {% if theme_single_page != True %}
-      <button id="navbar-toggler" class="navbar-toggler ml-0" type="button" data-toggle="collapse"
-        data-toggle="tooltip" data-placement="bottom" data-target=".site-navigation" aria-controls="navbar-menu"
-        aria-expanded="true" aria-label="{{ translate('Toggle navigation') }}" aria-controls="site-navigation"
-        title="{{ translate('Toggle navigation') }}" data-toggle="tooltip" data-placement="left">
-        <i class="fas fa-bars"></i>
-        <i class="fas fa-arrow-left"></i>
-        <i class="fas fa-arrow-up"></i>
-      </button>
-      {% endif %}
-      {% include "topbar/download.html" %}
-      {% include "topbar/repobuttons.html" %}
-      {% include "topbar/fullscreen.html" %}
-      {% include "topbar/launchbuttons.html" %}
-    </div>
-
-    <!-- Table of contents -->
-    <div class="d-none d-md-block col-md-2 bd-toc show noprint">
-      {% set page_toc = generate_toc_html() %}
-
-      {%- if page_toc | length >= 1 %}
-      <div class="tocsection onthispage pt-5 pb-3">
-        <i class="fas fa-list"></i> {{ translate(theme_toc_title) }}
-      </div>
-      <nav id="bd-toc-nav" aria-label="Page">
-        {{ page_toc }}
-      </nav>
-      {%- endif %}
-    </div>
-  </div>
-</div>
\ No newline at end of file