diff --git a/custom_dns.php b/custom_dns.php
index 5e594d7c..3797af95 100644
--- a/custom_dns.php
+++ b/custom_dns.php
@@ -15,17 +15,34 @@
 </div>
 
 <!-- Domain Input -->
-<form class="form-inline" >
-    <div class="form-group">
-        <input id="domain" type="text" class="form-control" placeholder="Add a domain (example.com or sub.example.com)">
+<div class="row">
+    <div class="col-md-12">
+        <div class="box">
+            <!-- /.box-header -->
+            <div class="box-header with-border">
+                <h3 class="box-title">
+                    Add a new domain/IP combination
+                </h3>
+            </div>
+            <!-- /.box-header -->
+            <div class="box-body">
+                <div class="row">
+                    <div class="col-md-6">
+                        <label for="ex1">Name:</label>
+                        <input id="domain" type="text" class="form-control" placeholder="Add a domain (example.com or sub.example.com)">
+                    </div>
+                    <div class="col-md-6">
+                        <label for="ex2">Description:</label>
+                        <input id="ip" type="text" class="form-control" placeholder="Associated IP address">
+                    </div>
+                </div>
+            </div>
+            <div class="box-footer clearfix">
+                <button id="btnAdd" class="btn btn-primary pull-right">Add</button>
+            </div>
+        </div>
     </div>
-    <div class="form-group">
-        <input id="ip" type="text" class="form-control" placeholder="Define an associate IP">
-    </div>
-    <div class="form-group">
-        <button id="btnAdd" class="btn btn-default" type="button">Add</button>
-    </div>
-</form>
+</div>
 
 <!-- Alerts -->
 <div id="alInfo" class="alert alert-info alert-dismissible fade in" role="alert" hidden="true">
diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 8e594b47..3e48914a 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -485,14 +485,7 @@ if($auth) {
                         <i class="fa fa-ban"></i> <span>Blacklist</span>
                     </a>
                 </li>
-                <!-- Custom DNS -->
-                <li<?php if($scriptname === "custom_dns.php"){ ?> class="active"<?php } ?>>
-                    <a href="custom_dns.php">
-                        <i class="fa fa-address-book"></i> <span>Custom DNS</span>
-                    </a>
-                </li>
                 <!-- Toggle -->
-
                 <li id="pihole-disable" class="treeview"<?php if ($pistatus == "0") { ?> hidden="true"<?php } ?>>
                   <a href="#">
                     <span class="pull-right-container">
@@ -591,6 +584,12 @@ if($auth) {
                         <i class="fa fa-cogs"></i> <span>Settings</span>
                     </a>
                 </li>
+                <!-- Custom DNS -->
+                <li<?php if($scriptname === "custom_dns.php"){ ?> class="active"<?php } ?>>
+                    <a href="custom_dns.php">
+                        <i class="fa fa-address-book"></i> <span>Custom DNS</span>
+                    </a>
+                </li>
                 <!-- Logout -->
                 <?php
                 // Show Logout button if $auth is set and authorization is required