diff --git a/templates/layouts/base.html b/templates/layouts/base.html
index ae4df78..b08ed8c 100644
--- a/templates/layouts/base.html
+++ b/templates/layouts/base.html
@@ -13,9 +13,11 @@
         <div class="content-outer">
             <div class="content">
                 {% include 'layouts/header.html' %}
-                {% block content %}
-                    Do not extend <strong>base.html</strong> directly.
-                {% endblock content %}
+                <div class="content-inner">
+                    {% block content %}
+                        Do not extend <strong>base.html</strong> directly.
+                    {% endblock content %}
+                </div>
             </div>
             {% include 'layouts/footer.html' %}
         </div>
diff --git a/templates/layouts/index.html b/templates/layouts/index.html
index 190318f..c2b786b 100644
--- a/templates/layouts/index.html
+++ b/templates/layouts/index.html
@@ -1,10 +1,5 @@
 {% extends 'layouts/base.html' %}
 
 {% block content %}
-    <div class="content-inner">
     <h4>New Users</h4>
-    <div>
-
-    </div>
-    </div>
 {% endblock %}
diff --git a/templates/pages/about.html b/templates/pages/about.html
index 3644ac6..e6bb895 100644
--- a/templates/pages/about.html
+++ b/templates/pages/about.html
@@ -1,6 +1,5 @@
 {% extends 'layouts/index.html' %}
 {% block content %}
-    <div class="content-inner">
         <div id="about">
             <p>Designed for RowdyHacks 2022, <strong>Runnerspace</strong> is a retro throwback site designed to mimic the feel and features
                 of the popular website 'MySpace' and other social media of it's era. Runnerspace aims to be simple, easy to use, easy to
@@ -11,5 +10,4 @@
                 Seligman</a>. You can find all the source code and a full commit log at <a href="https://github.com/Xevion/runnerspace">github.com/Xevion/runnerspace</a>.
             </p>
         </div>
-    </div>
 {% endblock %}
diff --git a/templates/pages/auth/login.html b/templates/pages/auth/login.html
index dda9d5b..6eaf838 100644
--- a/templates/pages/auth/login.html
+++ b/templates/pages/auth/login.html
@@ -1,6 +1,5 @@
 {% extends 'layouts/index.html' %}
 {% block content %}
-    <div class="content-inner">
         {% with messages = get_flashed_messages() %}
             {% if messages %}
                 <div class="notification is-danger">
@@ -33,5 +32,4 @@
         <p class="form-subtext">
             Don't have a login? <a href="{{ url_for('main.signup') }}">Sign-up</a> instead!
         </p>
-    </div>
 {% endblock content %}
diff --git a/templates/pages/auth/signup.html b/templates/pages/auth/signup.html
index a375783..1a5cd90 100644
--- a/templates/pages/auth/signup.html
+++ b/templates/pages/auth/signup.html
@@ -1,7 +1,6 @@
 {% extends 'layouts/index.html' %}
 
 {% block content %}
-    <div class="content-inner">
         {% with messages = get_flashed_messages() %}
             {% if messages %}
                 <div class="notification is-danger">
@@ -36,5 +35,4 @@
         <p class="form-subtext">
             Already have a login? <a href="{{ url_for('main.login') }}">Login</a> instead!
         </p>
-    </div>
 {% endblock content %}
diff --git a/templates/pages/blogs.html b/templates/pages/blogs.html
index 3fd01ed..7dfff4b 100644
--- a/templates/pages/blogs.html
+++ b/templates/pages/blogs.html
@@ -1 +1,3 @@
 {% extends 'layouts/index.html' %}
+{% block content %}
+{% endblock %}
diff --git a/templates/pages/browse.html b/templates/pages/browse.html
index 78a93b2..70fad9f 100644
--- a/templates/pages/browse.html
+++ b/templates/pages/browse.html
@@ -1,7 +1,6 @@
 {% extends 'layouts/index.html' %}
 
 {% block content %}
-    <div class="content-inner">
         <div class="user-list">
             {% for user_row in users|batch(2, '&nbsp;') %}
                 <div class="user-list-row">
@@ -32,5 +31,4 @@
                 </div>
             {% endfor %}
         </div>
-    </div>
 {% endblock %}
diff --git a/templates/pages/feed.html b/templates/pages/feed.html
index 3fd01ed..86d9f80 100644
--- a/templates/pages/feed.html
+++ b/templates/pages/feed.html
@@ -1 +1,5 @@
 {% extends 'layouts/index.html' %}
+
+{% block content %}
+
+{% endblock content %}
diff --git a/templates/pages/groups.html b/templates/pages/groups.html
index 3fd01ed..cd14722 100644
--- a/templates/pages/groups.html
+++ b/templates/pages/groups.html
@@ -1 +1,4 @@
 {% extends 'layouts/index.html' %}
+{% block content %}
+
+{% endblock %}
diff --git a/templates/pages/messages.html b/templates/pages/messages.html
index 3fd01ed..cd14722 100644
--- a/templates/pages/messages.html
+++ b/templates/pages/messages.html
@@ -1 +1,4 @@
 {% extends 'layouts/index.html' %}
+{% block content %}
+
+{% endblock %}
diff --git a/templates/pages/search.html b/templates/pages/search.html
index 3fd01ed..cd14722 100644
--- a/templates/pages/search.html
+++ b/templates/pages/search.html
@@ -1 +1,4 @@
 {% extends 'layouts/index.html' %}
+{% block content %}
+
+{% endblock %}
diff --git a/templates/pages/user.html b/templates/pages/user.html
index b09115b..1e46a09 100644
--- a/templates/pages/user.html
+++ b/templates/pages/user.html
@@ -1,7 +1,6 @@
 {% extends 'layouts/index.html' %}
 
 {% block content %}
-    <div class="content-inner">
         <div class="profile-title">
             <span class="profile-username">{{ user.name }}</span>
             {% with seen_text = user.get_last_seen() %}
@@ -28,5 +27,4 @@
                 </p>
             </div>
         </div>
-    </div>
 {% endblock %}
diff --git a/templates/pages/user_edit.html b/templates/pages/user_edit.html
index 86386d6..778038d 100644
--- a/templates/pages/user_edit.html
+++ b/templates/pages/user_edit.html
@@ -1,8 +1,5 @@
 {% extends 'layouts/index.html' %}
 
 {% block content %}
-<div class="content-inner">
 <h3>Edit Profile</h3>
-
-</div>
 {% endblock %}