diff --git a/app/configuration/styles/network.scss b/app/configuration/styles/network.scss
index 0a822bd..b0de4f7 100644
--- a/app/configuration/styles/network.scss
+++ b/app/configuration/styles/network.scss
@@ -14,12 +14,19 @@
     height: 2.1em;
     margin-bottom: 1.2em;
   }
-  label {
-    min-width: 300px;
+
+  .net-config__fieldset {
+    margin-bottom: 1.2rem;
+
+    legend {
+      padding-bottom: 0.5rem;
+    }
+
+    .net-config__fieldset-content {
+      padding-left: 1.8em;
+    }
   }
-  fieldset {
-    padding-left: 1.8em;
-  }
+
   .net-config__static-ip-wrap {
     width: 100%;
     padding-left: 0;
@@ -39,6 +46,13 @@
     margin-top: 3em;
     padding-top: 1em;
     border-top: 1px solid $medgrey;
+
+    &::after {
+      content: " ";
+      display: block;
+      clear: both;
+    }
+
     button {
       float: right;
       margin: .5em;
diff --git a/app/configuration/styles/snmp.scss b/app/configuration/styles/snmp.scss
index 47dc80f..ea20a6a 100644
--- a/app/configuration/styles/snmp.scss
+++ b/app/configuration/styles/snmp.scss
@@ -90,11 +90,11 @@
   }
   .btn-add {
     &:focus {
-      outline:0;
+      outline-offset: 3px;
     }
-    margin-top: 1em;
+    margin: 2em 0;
     color: $primebtn__bg;
-    padding: 2em 0 3em 0;
+    padding: 1em 0;
   }
   .snmp__submit-wrapper {
     width: 100%;