diff --git a/Configuration.ui b/Configuration.ui
index bf58ac3fc..f87bbedd0 100644
--- a/Configuration.ui
+++ b/Configuration.ui
@@ -2176,32 +2176,6 @@ Right click for insert and delete options.</string>
       <layout class="QGridLayout" name="gridLayout_5" rowstretch="1,1,2" columnstretch="1,1,2">
        <item row="1" column="1">
         <layout class="QGridLayout" name="gridLayout_13">
-         <item row="6" column="1">
-          <widget class="QLabel" name="labNewCallBand">
-           <property name="styleSheet">
-            <string notr="true">QLabel{background-color: #99ffff}</string>
-           </property>
-           <property name="text">
-            <string notr="true">K1ABC</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="7" column="1">
-          <widget class="QLabel" name="labNewGrid">
-           <property name="styleSheet">
-            <string notr="true">QLabel{background-color: #ff8000}</string>
-           </property>
-           <property name="text">
-            <string notr="true">K1ABC</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
          <item row="4" column="1">
           <widget class="QLabel" name="labDXCCband">
            <property name="styleSheet">
@@ -2216,19 +2190,6 @@ Right click for insert and delete options.</string>
            </property>
           </widget>
          </item>
-         <item row="8" column="1">
-          <widget class="QLabel" name="labNewGridBand">
-           <property name="styleSheet">
-            <string notr="true">QLabel{background-color: #ffcc99}</string>
-           </property>
-           <property name="text">
-            <string notr="true">K1ABC</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
          <item row="4" column="0">
           <widget class="QPushButton" name="pbNewDXCCband">
            <property name="text">
@@ -2236,27 +2197,6 @@ Right click for insert and delete options.</string>
            </property>
           </widget>
          </item>
-         <item row="6" column="0">
-          <widget class="QPushButton" name="pbNewCallBand">
-           <property name="text">
-            <string>New Call on Band</string>
-           </property>
-          </widget>
-         </item>
-         <item row="7" column="0">
-          <widget class="QPushButton" name="pbNewGrid">
-           <property name="text">
-            <string>New grid</string>
-           </property>
-          </widget>
-         </item>
-         <item row="8" column="0">
-          <widget class="QPushButton" name="pbNewGridBand">
-           <property name="text">
-            <string>New Grid on Band</string>
-           </property>
-          </widget>
-         </item>
          <item row="0" column="0">
           <widget class="QPushButton" name="pbCQmsg">
            <property name="minimumSize">
@@ -2385,7 +2325,27 @@ Right click for insert and delete options.</string>
            </property>
           </widget>
          </item>
+         <item row="9" column="0">
+          <widget class="QPushButton" name="pbResetDefaults">
+           <property name="text">
+            <string>Reset Defaults</string>
+           </property>
+          </widget>
+         </item>
          <item row="5" column="1">
+          <widget class="QLabel" name="labNewGrid">
+           <property name="styleSheet">
+            <string notr="true">QLabel{background-color: #ff8000}</string>
+           </property>
+           <property name="text">
+            <string notr="true">K1ABC</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="7" column="1">
           <widget class="QLabel" name="labNewCall">
            <property name="minimumSize">
             <size>
@@ -2404,7 +2364,40 @@ Right click for insert and delete options.</string>
            </property>
           </widget>
          </item>
+         <item row="6" column="1">
+          <widget class="QLabel" name="labNewGridBand">
+           <property name="styleSheet">
+            <string notr="true">QLabel{background-color: #ffcc99}</string>
+           </property>
+           <property name="text">
+            <string notr="true">K1ABC</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="8" column="1">
+          <widget class="QLabel" name="labNewCallBand">
+           <property name="styleSheet">
+            <string notr="true">QLabel{background-color: #99ffff}</string>
+           </property>
+           <property name="text">
+            <string notr="true">K1ABC</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
          <item row="5" column="0">
+          <widget class="QPushButton" name="pbNewGrid">
+           <property name="text">
+            <string>New grid</string>
+           </property>
+          </widget>
+         </item>
+         <item row="7" column="0">
           <widget class="QPushButton" name="pbNewCall">
            <property name="minimumSize">
             <size>
@@ -2417,10 +2410,17 @@ Right click for insert and delete options.</string>
            </property>
           </widget>
          </item>
-         <item row="9" column="0">
-          <widget class="QPushButton" name="pbResetDefaults">
+         <item row="6" column="0">
+          <widget class="QPushButton" name="pbNewGridBand">
            <property name="text">
-            <string>Reset Defaults</string>
+            <string>New Grid on Band</string>
+           </property>
+          </widget>
+         </item>
+         <item row="8" column="0">
+          <widget class="QPushButton" name="pbNewCallBand">
+           <property name="text">
+            <string>New Call on Band</string>
            </property>
           </widget>
          </item>
@@ -3033,7 +3033,6 @@ soundcard changes</string>
   <tabstop>pbMyCall</tabstop>
   <tabstop>pbTxMsg</tabstop>
   <tabstop>pbNewDXCC</tabstop>
-  <tabstop>pbNewCall</tabstop>
   <tabstop>sbNtrials</tabstop>
   <tabstop>sbAggressive</tabstop>
   <tabstop>cbTwoPass</tabstop>
diff --git a/colorhighlighting.ui b/colorhighlighting.ui
index b7865c465..65f46bd78 100644
--- a/colorhighlighting.ui
+++ b/colorhighlighting.ui
@@ -16,6 +16,81 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QGridLayout" name="gridLayout">
+     <item row="5" column="0">
+      <widget class="QLabel" name="label_15">
+       <property name="text">
+        <string>K1ABC</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="0">
+      <widget class="QLabel" name="label_17">
+       <property name="text">
+        <string>K1ABC</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="0">
+      <widget class="QLabel" name="label_11">
+       <property name="text">
+        <string>K1ABC</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="0">
+      <widget class="QLabel" name="label_13">
+       <property name="text">
+        <string>K1ABC</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="1">
+      <widget class="QLabel" name="label_12">
+       <property name="text">
+        <string>New Call</string>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="1">
+      <widget class="QLabel" name="label_14">
+       <property name="text">
+        <string>New Call on Band</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="QLabel" name="label_16">
+       <property name="text">
+        <string>New Grid</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="QLabel" name="label_18">
+       <property name="text">
+        <string>New Grid on Band</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>Transmitted message</string>
+       </property>
+      </widget>
+     </item>
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="text">
@@ -26,15 +101,8 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>CQ in message</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_3">
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_9">
        <property name="text">
         <string>K1ABC</string>
        </property>
@@ -43,13 +111,6 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string>My Call in message</string>
-       </property>
-      </widget>
-     </item>
      <item row="2" column="0">
       <widget class="QLabel" name="label_5">
        <property name="text">
@@ -60,15 +121,8 @@
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
-      <widget class="QLabel" name="label_6">
-       <property name="text">
-        <string>Transmitted message</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="label_7">
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_3">
        <property name="text">
         <string>K1ABC</string>
        </property>
@@ -84,16 +138,6 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="label_9">
-       <property name="text">
-        <string>K1ABC</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-      </widget>
-     </item>
      <item row="4" column="1">
       <widget class="QLabel" name="label_10">
        <property name="text">
@@ -101,8 +145,15 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="0">
-      <widget class="QLabel" name="label_11">
+     <item row="1" column="1">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>My Call in message</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_7">
        <property name="text">
         <string>K1ABC</string>
        </property>
@@ -111,61 +162,10 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="1">
-      <widget class="QLabel" name="label_12">
+     <item row="0" column="1">
+      <widget class="QLabel" name="label_2">
        <property name="text">
-        <string>New Call</string>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="0">
-      <widget class="QLabel" name="label_13">
-       <property name="text">
-        <string>K1ABC</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="1">
-      <widget class="QLabel" name="label_14">
-       <property name="text">
-        <string>New Call on Band</string>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="0">
-      <widget class="QLabel" name="label_15">
-       <property name="text">
-        <string>K1ABC</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="1">
-      <widget class="QLabel" name="label_16">
-       <property name="text">
-        <string>New Grid</string>
-       </property>
-      </widget>
-     </item>
-     <item row="8" column="0">
-      <widget class="QLabel" name="label_17">
-       <property name="text">
-        <string>K1ABC</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="8" column="1">
-      <widget class="QLabel" name="label_18">
-       <property name="text">
-        <string>New Grid on Band</string>
+        <string>CQ in message</string>
        </property>
       </widget>
      </item>