diff --git a/lanscape/core/net_tools.py b/lanscape/core/net_tools.py
index e66a9b7..a41961f 100644
--- a/lanscape/core/net_tools.py
+++ b/lanscape/core/net_tools.py
@@ -98,6 +98,10 @@ def get_metadata(self):
         if self.alive:
             self.hostname = self._get_hostname()
             self._get_mac_addresses()
+            if not self.manufacturer:
+                self.manufacturer = self._get_manufacturer(
+                    self.get_mac()
+                )
 
     # Fallback for pydantic v1: use dict() and enrich output
     if not _PYD_V2:
diff --git a/lanscape/ui/static/css/style.css b/lanscape/ui/static/css/style.css
index 3de1c74..c2a6fbb 100644
--- a/lanscape/ui/static/css/style.css
+++ b/lanscape/ui/static/css/style.css
@@ -66,13 +66,16 @@ body:has(.submodule) footer {
 
 #header {
     background-color: var(--primary-bg);
-    padding: 8px 20px;
+    padding: 8px 2%;
     margin: 0;
     display: block;
     position: relative;
     box-shadow: 0 0 10px var(--box-shadow);
     width: 100vw;
 }
+#header .title {
+    font-size: 36px;
+}
 
 footer {
     position: sticky;
@@ -163,7 +166,12 @@ details {
 
 
 #scan-form {
-    width: 500px;
+    width: 60vw;
+    margin: 0;
+    min-width: 300px;
+    max-width: 700px;
+}
+#scan-form .form-group {
     margin: 0;
 }
 #scan-form label {
@@ -304,6 +312,9 @@ details {
 }
 #advanced-modal label {
     font-size: 12px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
 }
 #advanced-modal .form-check {
     width: fit-content;
@@ -447,8 +458,10 @@ button {
 
 #scan-form #scan-submit {
     border: none;
-    padding: 10px 20px;
-    margin-top: 15px;
+    padding: 10px 3%;
+    margin: 0 15px;
+    min-width: 55px;
+    height: 42px;
 }
 
 /* Button Styling */
@@ -657,10 +670,6 @@ input[type="range"] {
 .table thead tr th.detail-col
 {
     width: 30px;
-    /*
-    background-color: var(--body-bg);
-    border: 1px solid var(--text-almost-hidden);
-    */
 }
 .table td:has(.info-icon-container) {
     width: 30px;
@@ -709,6 +718,12 @@ input[type="range"] {
 span.alt {
     color: var(--text-accent-color);
 }
+span.no-wrap {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: block;
+}
 .colorful-buttons a{
     margin:2px;
     color: var(--text-color);
diff --git a/lanscape/ui/static/js/core.js b/lanscape/ui/static/js/core.js
index 50f8950..4046057 100644
--- a/lanscape/ui/static/js/core.js
+++ b/lanscape/ui/static/js/core.js
@@ -1,10 +1,12 @@
 $(document).ready(function() {
     rightSizeDocLayout(0,showFooter);
     initTooltips();
+    adjustNoWrap();
 })
 
 $(window).on('resize', function() {
     rightSizeDocLayout();
+    adjustNoWrap();
 });
 
 
@@ -36,4 +38,16 @@ function initTooltips() {
     tooltipTriggerList.map(function (tooltipTriggerEl) {
     return new bootstrap.Tooltip(tooltipTriggerEl)
     })
+}
+
+/*
+    An imperfect approach to adjusting 
+    text field width within a table
+*/
+function adjustNoWrap() {
+    $('.no-wrap').width(0);
+    $('.no-wrap').each(function() {
+        var parentWidth = $(this).parent().width();
+        $(this).width(parseInt(parentWidth));
+    });
 }
\ No newline at end of file
diff --git a/lanscape/ui/static/js/quietReload.js b/lanscape/ui/static/js/quietReload.js
index 564d5fd..11aaad9 100644
--- a/lanscape/ui/static/js/quietReload.js
+++ b/lanscape/ui/static/js/quietReload.js
@@ -8,6 +8,9 @@ function quietReload() {
             var newDoc = new DOMParser().parseFromString(data, 'text/html');
             // replace current body with the new body content
             $('body').html($(newDoc.body).html());
+            if (typeof adjustNoWrap === 'function') {
+                adjustNoWrap();
+            }
         });
     }
     setTimeout(function() {
diff --git a/lanscape/ui/templates/main.html b/lanscape/ui/templates/main.html
index 7939b0e..145d806 100644
--- a/lanscape/ui/templates/main.html
+++ b/lanscape/ui/templates/main.html
@@ -3,45 +3,43 @@
 {% block content %}
 <div id="header">
       <!-- Header and Scan Submission Inline -->
-    <div class="d-flex justify-content-between align-items-center flex-nowrap">
+    <div class="d-flex justify-content-between align-items-center flex-wrap">
         <a href="/" class="text-decoration-none" aria-label="Go to homepage">
             <h1 class="title">
                 <span>LAN</span>scape 
             </h1>
         </a>
         <!-- Right side: settings + form -->
-        <div class="d-flex align-items-center justify-content-end ms-auto">
-            <form id="scan-form" class="d-flex align-items-center">
-                <div class="form-group me-2">
-                    <!-- Above subnet input -->
-                    <div class="label-container">
-                        <label for="subnet">Subnet:</label>
-                        <div id="subnet-info"></div>
-                    </div>
-                    <!-- Subnet input with dropdown -->
-                    <div class="input-group">
-                        <button
-                            type="button"
-                            id="settings-btn"
-                            class="btn btn-secondary start"
-                            data-bs-toggle="tooltip"
-                            data-bs-placement="bottom"
-                            title="Advanced scan settings"
-                        >
-                            <i class="fa-solid fa-gear"></i>
-                        </button>
-                        <input type="text" id="subnet" name="subnet" class="form-control" value="{{ subnet }}" placeholder="Enter subnet">
-                        <button class="btn btn-secondary dropdown-toggle end" type="button" id="subnet-dropdown" data-bs-toggle="dropdown" aria-expanded="false"></button>
-                        <ul class="dropdown-menu" aria-labelledby="subnet-dropdown" id="dropdown-list">
-                            {% for subnet_option in alternate_subnets %}
-                            <li><a class="dropdown-item" href="#">{{ subnet_option['subnet'] }}</a></li>
-                            {% endfor %}
-                        </ul>
-                    </div>
+        <form id="scan-form" class="d-flex align-items-end">
+            <div class="form-group me-2">
+                <!-- Above subnet input -->
+                <div class="label-container">
+                    <label for="subnet">Subnet:</label>
+                    <div id="subnet-info"></div>
                 </div>
-                <button type="submit" id="scan-submit" class="btn btn-primary">Scan</button>
-            </form>
-        </div>
+                <!-- Subnet input with dropdown -->
+                <div class="input-group">
+                    <button
+                        type="button"
+                        id="settings-btn"
+                        class="btn btn-secondary start"
+                        data-bs-toggle="tooltip"
+                        data-bs-placement="bottom"
+                        title="Advanced scan settings"
+                    >
+                        <i class="fa-solid fa-gear"></i>
+                    </button>
+                    <input type="text" id="subnet" name="subnet" class="form-control" value="{{ subnet }}" placeholder="Enter subnet">
+                    <button class="btn btn-secondary dropdown-toggle end" type="button" id="subnet-dropdown" data-bs-toggle="dropdown" aria-expanded="false"></button>
+                    <ul class="dropdown-menu" aria-labelledby="subnet-dropdown" id="dropdown-list">
+                        {% for subnet_option in alternate_subnets %}
+                        <li><a class="dropdown-item" href="#">{{ subnet_option['subnet'] }}</a></li>
+                        {% endfor %}
+                    </ul>
+                </div>
+            </div>
+            <button type="submit" id="scan-submit" class="btn btn-primary">Scan</button>
+        </form>
     </div>
 
     <div id="scan-progress-bar"></div>
diff --git a/lanscape/ui/templates/scan/config.html b/lanscape/ui/templates/scan/config.html
index 1b681b4..a21ddde 100644
--- a/lanscape/ui/templates/scan/config.html
+++ b/lanscape/ui/templates/scan/config.html
@@ -94,7 +94,7 @@ <h6>Device Detection <span class=text-color>/</span> Ping Settings</h6>
                     </div>
                     <div class="col-1 descriptor">=</div>
                     <div class="col-3">
-                        <label for="total-ping-attempts">Max pings per device</label>
+                        <label for="total-ping-attempts" id="tpa-label">Max pings per device</label>
                         <input type="number" id="total-ping-attempts" class="form-control" readonly>
                     </div>
                 </div>
diff --git a/lanscape/ui/templates/scan/ip-table-row.html b/lanscape/ui/templates/scan/ip-table-row.html
index 8bf7c6a..72b00a6 100644
--- a/lanscape/ui/templates/scan/ip-table-row.html
+++ b/lanscape/ui/templates/scan/ip-table-row.html
@@ -7,20 +7,20 @@
             ></i>
         </div>
     </td>
-    <td>
+    <td class="ip">
         <div>{{ device.ip }}</div>
         {% if device.hostname %} 
-            <div><span class=alt>{{device.hostname}}</span></div>
+            <span class="alt no-wrap">{{device.hostname}}</span>
         {% endif %}
     </td>
-    <td>
+    <td class="mac">
         <div>{{ device.mac_addr or 'Unknown' }}</div>
         {% if device.manufacturer %} 
-            <div><span class="alt">{{device.manufacturer}}</span></div>
+            <span class="alt no-wrap">{{device.manufacturer}}</span>
         {% endif %}
     </td>
-    <td>{{ device.ports | join(", ") }}</td>
-    <td>
+    <td class="ports">{{ device.ports | join(", ") }}</td>
+    <td class="stage">
         {% if device.stage == 'complete' %}
             <span class="badge badge-success">complete</span>
         {% elif device.stage == 'found' %}
diff --git a/lanscape/ui/templates/scan/ip-table.html b/lanscape/ui/templates/scan/ip-table.html
index ccab64e..1009366 100644
--- a/lanscape/ui/templates/scan/ip-table.html
+++ b/lanscape/ui/templates/scan/ip-table.html
@@ -9,10 +9,10 @@
         <thead>
             <tr>
                 <th class="detail-col" scope="col"></th>
-                <th scope="col">IP / <span class="alt">Host</span></th>
-                <th scope="col">MAC / <span class="alt">Manufacturer</span></th>
-                <th scope="col">Open Ports</th>
-                <th scope="col">Stage</th>
+                <th class="ip" scope="col">IP / <span class="alt">Host</span></th>
+                <th class="mac" scope="col">MAC / <span class="alt">Manufacturer</span></th>
+                <th class="ports" scope="col">Open Ports</th>
+                <th class="stage" scope="col">Stage</th>
             </tr>
         </thead>
         <tbody>