diff --git a/htdocs/css/admin.css b/htdocs/css/admin.css
index 019be64..7597188 100644
--- a/htdocs/css/admin.css
+++ b/htdocs/css/admin.css
@@ -29,11 +29,8 @@ hr {
     margin: 15px 15px 0;
 }
 
-.settings-section {
-    margin-top: 3em;
-}
-
 .settings-section h3 {
+    margin-top: 1em;
     margin-bottom: 1em;
 }
 
@@ -71,6 +68,18 @@ h1 {
     font-size: 1.2rem;
 }
 
+.tab-body {
+    overflow: auto;
+    border: 1px solid #444;
+    border-top: none;
+    border-bottom-left-radius: 0.25rem;
+    border-bottom-right-radius: 0.25rem;
+}
+
+.tab-body .form-group {
+    padding-right: 15px;
+}
+
 table.bookmarks .frequency {
     text-align: right;
 }
diff --git a/owrx/controllers/settings/sdr.py b/owrx/controllers/settings/sdr.py
index 704075f..4966c41 100644
--- a/owrx/controllers/settings/sdr.py
+++ b/owrx/controllers/settings/sdr.py
@@ -108,7 +108,15 @@ class SdrFormController(SettingsFormController, metaclass=ABCMeta):
         return self.device["name"]
 
     def render_sections(self):
-        return self.render_tabs() + super().render_sections()
+        return """
+            {tabs}
+            <div class="tab-body">
+                {sections}
+            </div>
+        """.format(
+            tabs=self.render_tabs(),
+            sections=super().render_sections(),
+        )
 
     def render_tabs(self):
         return """