diff --git a/assets/less/mio/classes/settings/account.less b/assets/less/mio/classes/settings/account.less
index e20d71e3..e1868a4d 100644
--- a/assets/less/mio/classes/settings/account.less
+++ b/assets/less/mio/classes/settings/account.less
@@ -3,6 +3,7 @@
 .settings__account {
     display: flex;
     flex-direction: column;
+    margin: 1px;
 
     &__disabled {
         text-align: center;
diff --git a/assets/less/mio/classes/settings/content.less b/assets/less/mio/classes/settings/content.less
deleted file mode 100644
index caad50bd..00000000
--- a/assets/less/mio/classes/settings/content.less
+++ /dev/null
@@ -1,11 +0,0 @@
-.settings__content {
-    &--account,
-    &--sessions,
-    &--login-history {
-        margin: 1px;
-    }
-
-    &--images {
-        margin: 2px;
-    }
-}
diff --git a/assets/less/mio/classes/settings/images.less b/assets/less/mio/classes/settings/images.less
index 4eeb4165..4adb3206 100644
--- a/assets/less/mio/classes/settings/images.less
+++ b/assets/less/mio/classes/settings/images.less
@@ -4,6 +4,7 @@
     display: flex;
     min-height: 200px;
     justify-content: space-between;
+    margin: 2px;
 
     @media (max-width: @mio-settings-images-mobile) {
         flex-direction: column-reverse;
diff --git a/assets/less/mio/classes/settings/log.less b/assets/less/mio/classes/settings/log.less
index 80a6f4b0..e635d601 100644
--- a/assets/less/mio/classes/settings/log.less
+++ b/assets/less/mio/classes/settings/log.less
@@ -1,4 +1,6 @@
 .settings__log {
+    margin: 1px;
+
     &__country {
         vertical-align: middle;
     }
diff --git a/assets/less/mio/classes/settings/login-history.less b/assets/less/mio/classes/settings/login-history.less
index b057c6e0..94480d94 100644
--- a/assets/less/mio/classes/settings/login-history.less
+++ b/assets/less/mio/classes/settings/login-history.less
@@ -1,4 +1,6 @@
 .settings__login-history {
+    margin: 1px;
+
     &__country {
         vertical-align: middle;
     }
diff --git a/assets/less/mio/classes/settings/sessions.less b/assets/less/mio/classes/settings/sessions.less
index 42c0434c..e3c94ab2 100644
--- a/assets/less/mio/classes/settings/sessions.less
+++ b/assets/less/mio/classes/settings/sessions.less
@@ -1,6 +1,8 @@
 @mio-settings-sessions-mobile: 1000px;
 
 .settings__sessions {
+    margin: 1px;
+
     &__country {
         vertical-align: middle;
     }
diff --git a/assets/less/mio/main.less b/assets/less/mio/main.less
index c335d15d..c95739ea 100644
--- a/assets/less/mio/main.less
+++ b/assets/less/mio/main.less
@@ -62,7 +62,6 @@ body {
 @import "classes/changelog";
 
 // Settings
-@import "classes/settings/content";
 @import "classes/settings/description";
 @import "classes/settings/errors";
 @import "classes/settings/pagination";
diff --git a/views/mio/changelog/change.twig b/views/mio/changelog/change.twig
index 29e739e2..7f6be163 100644
--- a/views/mio/changelog/change.twig
+++ b/views/mio/changelog/change.twig
@@ -16,7 +16,7 @@
         <div class="container__title changelog">
             {{ title }}
         </div>
-        <div class="container__content changelog__content">
+        <div class="changelog__content">
             {% if is_valid %}
                 <div class="changelog__change" id="#c{{ change.change_id }}">
                     <div class="changelog__change__line"
diff --git a/views/mio/changelog/index.twig b/views/mio/changelog/index.twig
index 174bef0d..24bba7a0 100644
--- a/views/mio/changelog/index.twig
+++ b/views/mio/changelog/index.twig
@@ -26,7 +26,7 @@
         <div class="container__title">
             {{ title }}
         </div>
-        <div class="container__content changelog__content">
+        <div class="changelog__content">
             {{ changelog_listing(changes, is_date) }}
 
             {% if not is_date %}
diff --git a/views/mio/forum/index.twig b/views/mio/forum/index.twig
index 5c8b9d17..bbd23035 100644
--- a/views/mio/forum/index.twig
+++ b/views/mio/forum/index.twig
@@ -15,7 +15,7 @@
 
         <div class="container forum__actions">
             <div class="container__title">Actions</div>
-            <div class="container__content forum__actions__content">
+            <div class="forum__actions__content">
                 <a class="input__button forum__actions__button">Mark All Read</a>
                 <a class="input__button forum__actions__button">Unanswered Posts</a>
                 <a class="input__button forum__actions__button">New Posts</a>
diff --git a/views/mio/forum/macros.twig b/views/mio/forum/macros.twig
index 71b5ba05..a601e9a2 100644
--- a/views/mio/forum/macros.twig
+++ b/views/mio/forum/macros.twig
@@ -3,7 +3,7 @@
 
     <div class="container forum__listing">
         <div class="container__title">{{ title }}</div>
-        <div class="container__content forum__listing__forums">
+        <div class="forum__listing__forums">
             {% if forums|length > 0 %}
                 {% for forum in forums %}
                     {{ forum_category_entry(forum) }}
@@ -152,7 +152,7 @@
 
     <div class="container forum__topics">
         <div class="container__title">Topics</div>
-        <div class="container__content forum__topics__listing">
+        <div class="forum__topics__listing">
             {% if topics|length > 0 %}
                 {% for topic in topics %}
                     {{ forum_topic_entry(topic) }}
@@ -313,7 +313,7 @@
             {{ title }}
         </div>
 
-        <div class="container__content forum__posting__content">
+        <div class="forum__posting__content">
             <input type="hidden" name="post[{{ is_reply ? 'topic' : 'forum' }}]" value="{{ target_id }}">
 
             {#<div class="forum__posting__errors">
diff --git a/views/mio/home/index.twig b/views/mio/home/index.twig
index 74903809..c4172e5d 100644
--- a/views/mio/home/index.twig
+++ b/views/mio/home/index.twig
@@ -19,7 +19,7 @@
 
             <div class="container">
                 <a class="container__title container__title--link" href="/changelog.php">Changelog</a>
-                <div class="container__content changelog__content">
+                <div class="changelog__content">
                     {{ changelog_listing(featured_changelog) }}
                 </div>
             </div>
@@ -37,7 +37,7 @@
 
             <div class="container news__container">
                 <a class="container__title container__title--link" href="/news.php">Featured News</a>
-                <div class="container__content news__container__content">
+                <div class="news__container__content">
                     <div class="news__preview__listing">
                         {% for post in featured_news %}
                             {{ news_preview(post) }}
diff --git a/views/mio/master.twig b/views/mio/master.twig
index 59364f5d..d7c569cb 100644
--- a/views/mio/master.twig
+++ b/views/mio/master.twig
@@ -31,7 +31,7 @@
                     {% if app.hasActiveSession %}
                         <div class="container header__user">
                             <div class="container__title">Hey, {{ current_user.username }}!</div>
-                            <div class="container__content header__user__content">
+                            <div class="header__user__content">
                                 <a href="/settings.php?m=images" class="avatar header__user__avatar" style="background-image:url('/profile.php?u={{ current_user.user_id }}&amp;m=avatar');"></a>
 
                                 <div class="header__user__links__container">
diff --git a/views/mio/news/category.twig b/views/mio/news/category.twig
index 13ea086d..623aa0f9 100644
--- a/views/mio/news/category.twig
+++ b/views/mio/news/category.twig
@@ -11,8 +11,7 @@
 {% block news_content %}
     <div class="container news__container">
         <div class="container__title news__container__title">News » {{ category.category_name }}</div>
-
-        <div class="container__content news__container__content">
+        <div class="news__container__content">
             <div class="news__preview__listing">
                 {% for post in posts %}
                     {{ news_preview(post) }}
diff --git a/views/mio/news/index.twig b/views/mio/news/index.twig
index 31c9df00..e446879d 100644
--- a/views/mio/news/index.twig
+++ b/views/mio/news/index.twig
@@ -8,8 +8,7 @@
 {% block news_content %}
     <div class="container news__container">
         <div class="container__title news__container__title">News</div>
-
-        <div class="container__content news__container__content">
+        <div class="news__container__content">
             <div class="news__preview__listing">
                 {% for post in posts %}
                     {{ news_preview(post) }}
diff --git a/views/mio/news/macros.twig b/views/mio/news/macros.twig
index 6b79409a..882ad83b 100644
--- a/views/mio/news/macros.twig
+++ b/views/mio/news/macros.twig
@@ -4,7 +4,7 @@
             {{ post.post_title }}
         </a>
 
-        <div class="container__content news__preview__content">
+        <div class="news__preview__content">
             <div class="news__preview__text">
                 {{ post.post_text|first_paragraph|parse_text('md')|raw }}
             </div>
diff --git a/views/mio/news/post.twig b/views/mio/news/post.twig
index 309d2a0e..1c04b93d 100644
--- a/views/mio/news/post.twig
+++ b/views/mio/news/post.twig
@@ -11,7 +11,7 @@
             {{ post.post_title }}
         </div>
 
-        <div class="container__content news__post__content">
+        <div class="news__post__content">
             <div class="news__post__text">
                 {{ post.post_text|parse_text('md')|raw }}
             </div>
diff --git a/views/mio/settings/master.twig b/views/mio/settings/master.twig
index 1b8418e0..3db446b7 100644
--- a/views/mio/settings/master.twig
+++ b/views/mio/settings/master.twig
@@ -22,11 +22,11 @@
 
     <div class="container settings settings--{{ settings_mode }}">
         <div class="container__title settings__title settings__title--{{ settings_mode }}">{{ title }}</div>
-        <div class="container__content settings__content settings__content--{{ settings_mode }}">
-            {% block settings_content %}
+        {% block settings_content %}
+            <div class="container__content">
                 This is a blank settings page.
-            {% endblock %}
-        </div>
+            </div>
+        {% endblock %}
     </div>
     {% endblock %}
 
diff --git a/views/mio/user/listing.twig b/views/mio/user/listing.twig
index fc0cb596..2593e81b 100644
--- a/views/mio/user/listing.twig
+++ b/views/mio/user/listing.twig
@@ -56,7 +56,7 @@
 
     <div class="container members__users">
         <div class="container__title">{{ title }}</div>
-        <div class="container__content members__users__content">
+        <div class="members__users__content">
             {% for user in users %}
                 <a class="members__user" href="/profile.php?u={{ user.user_id }}">
                     <div
diff --git a/views/mio/user/view.twig b/views/mio/user/view.twig
index 45ad5465..bfcc58dd 100644
--- a/views/mio/user/view.twig
+++ b/views/mio/user/view.twig
@@ -69,7 +69,7 @@
     <div class="profile">
         <div class="container profile__header">
             <div class="container__title">Profile of {{ profile.username }}</div>
-            <div class="container__content profile__header__content">
+            <div class="profile__header__content">
                 <div class="profile__info">
                     <div class="profile__info__section">
                         <div class="profile__info__block">