diff --git a/ui/general/mavlink.html b/ui/general/mavlink.html
index b638501..b6f5329 100644
--- a/ui/general/mavlink.html
+++ b/ui/general/mavlink.html
@@ -31,12 +31,12 @@
 
                 <div class="row justify-content-start">
                     <div class="col-2 ms-3"><label class="control-label" for="fmuDevice">Linux serial device</label></div>
-                    <div class="col"><select id="fmuDevice"></select></div>
+                    <div class="col-md-2"><select class="form-select" id="fmuDevice"></select></div>
                 </div>
 
                 <div class="row justify-content-start">
                     <div class="col-2 ms-3 mt-3"><label class="control-label" for="baudrate">Baud Rate (bps)</label></div>
-                    <div class="col mt-3"><select id="baudrate"></select></div>
+                    <div class="col-md-2 mt-3"><select class="form-select" id="baudrate"></select></div>
                 </div>
               
 
@@ -48,20 +48,20 @@
                     </div>
                 <div class="row justify-content-start">
                     <div class="col-2 ms-3"><label class="control-label" for="udpStatus">Status</label></div>
-                    <div class="col"><select id="udpStatus"></select></div>
+                    <div class="col-md-2"><select class="form-select" id="udpStatus"></select></div>
                 </div>
 
                 <div class="row justify-content-start">
                     <div class="col-2 ms-3 mt-3"><label class="control-label" for="udpMode">Mode</label></div>
-                    <div class="col mt-3"><select id="udpMode"></select></div>
+                    <div class="col-md-2 mt-3"><select class="form-select" id="udpMode"></select></div>
                 </div>
                 <div class="row justify-content-start">
                     <div class="col-2 ms-3 mt-3"><label class="control-label" for="losHost">Host</label></div>
-                    <div class="col mt-3"><input id="losHost"></div>
+                    <div class="col-md-2 mt-3"><input class="form-control" id="losHost"></div>
                 </div>
                 <div class="row justify-content-start">
                     <div class="col-2 ms-3 mt-3"><label class="control-label" for="losPort">Port</label></div>
-                    <div class="col mt-3"><input id="losPort"></div>
+                    <div class="col-md-2 mt-3"><input class="form-control" id="losPort"></div>
                 </div>
 
 
@@ -72,17 +72,17 @@
                     </div>
                 <div class="row justify-content-start">
                     <div class="col-2 ms-3"><label class="control-label" for="tcpStatus">Status</label></div>
-                    <div class="col"><select id="tcpStatus"></select></div>
+                    <div class="col-md-2"><select class="form-select" id="tcpStatus"></select></div>
                 </div>
 
                 
                 <div class="row justify-content-start">
                     <div class="col-2 ms-3 mt-3"><label class="control-label" for="tcpHost">Host</label></div>
-                    <div class="col mt-3"><input id="tcpHost"></div>
+                    <div class="col-md-2 mt-3"><input class="form-control" id="tcpHost"></div>
                 </div>
                 <div class="row justify-content-start">
                     <div class="col-2 ms-3 mt-3"><label class="control-label" for="tcpPort">Port</label></div>
-                    <div class="col mt-3"><input id="tcpPort"></div>
+                    <div class="col-md-2 mt-3"><input class="form-control" id="tcpPort"></div>
                 </div>
 
             </section>