diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css
index a18e632..76f3e32 100644
--- a/htdocs/css/openwebrx.css
+++ b/htdocs/css/openwebrx.css
@@ -421,12 +421,18 @@ input[type=range]:focus::-ms-fill-upper
 	color: #FFFF50;
 }
 
+.openwebrx-button:last-child {
+    margin-right: 0;
+}
+
 .openwebrx-demodulator-button
 {
 	width: 38px;
 	height: 19px;
 	font-size: 12pt;
 	text-align: center;
+	flex: 1;
+	margin-right: 5px;
 }
 
 .openwebrx-dial-button svg {
@@ -597,6 +603,11 @@ img.openwebrx-mirror-img
 	padding-top: 5px;
 }
 
+.openwebrx-panel-flex-line {
+    display: flex;
+    flex-direction: row;
+}
+
 .openwebrx-panel-line:first-child {
     padding-top: 0;
 }
@@ -707,6 +718,7 @@ img.openwebrx-mirror-img
 	width: 173px;
 	height: 27px;
 	padding-left:3px;
+	margin-right: 5px;
 }
 
 #openwebrx-sdr-profiles-listbox {
diff --git a/htdocs/index.html b/htdocs/index.html
index e098ec1..222fad0 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -60,7 +60,7 @@
                     <select id="openwebrx-sdr-profiles-listbox" onchange="sdr_profile_changed();">
                     </select>
                 </div>
-                <div class="openwebrx-panel-line">
+                <div class="openwebrx-panel-line openwebrx-panel-flex-line">
                     <div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-nfm"
                         onclick="demodulator_analog_replace('nfm');">FM</div>
                     <div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-am"
@@ -71,6 +71,8 @@
                         onclick="demodulator_analog_replace('usb');">USB</div>
                     <div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-cw"
                         onclick="demodulator_analog_replace('cw');">CW</div>
+                </div>
+                <div class="openwebrx-panel-line openwebrx-panel-flex-line">
                     <div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-dmr"
                          style="display:none;" data-feature="digital_voice_digiham"
                         onclick="demodulator_analog_replace('dmr');">DMR</div>
@@ -84,7 +86,7 @@
                          style="display:none;" data-feature="digital_voice_digiham"
                         onclick="demodulator_analog_replace('ysf');">YSF</div>
                 </div>
-                <div class="openwebrx-panel-line">
+                <div class="openwebrx-panel-line openwebrx-panel-flex-line">
                     <div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-dig" onclick="demodulator_digital_replace_last();">DIG</div>
                     <select id="openwebrx-secondary-demod-listbox" onchange="secondary_demod_listbox_changed();">
                         <option value="none"></option>