diff --git a/doc/img/Map_plugin_display_settings.png b/doc/img/Map_plugin_display_settings.png
new file mode 100644
index 000000000..718f8bd1d
Binary files /dev/null and b/doc/img/Map_plugin_display_settings.png differ
diff --git a/plugins/channelrx/demodadsb/adsbdemodreport.h b/plugins/channelrx/demodadsb/adsbdemodreport.h
index 699ab405d..1b313be7f 100644
--- a/plugins/channelrx/demodadsb/adsbdemodreport.h
+++ b/plugins/channelrx/demodadsb/adsbdemodreport.h
@@ -64,9 +64,9 @@ public:
         ) :
             Message(),
             m_data(data),
+            m_dateTime(dateTime),
             m_preambleCorrelation(preambleCorrelation),
-            m_correlationOnes(correlationOnes),
-            m_dateTime(dateTime)
+            m_correlationOnes(correlationOnes)
         {
         }
     };
diff --git a/plugins/feature/map/mapsettingsdialog.cpp b/plugins/feature/map/mapsettingsdialog.cpp
index 74a7b3c01..019e4c50f 100644
--- a/plugins/feature/map/mapsettingsdialog.cpp
+++ b/plugins/feature/map/mapsettingsdialog.cpp
@@ -122,11 +122,16 @@ MapSettingsDialog::MapSettingsDialog(MapSettings *settings, QWidget* parent) :
     ui->eciCamera->setCurrentIndex((int)m_settings->m_eciCamera);
     ui->antiAliasing->setCurrentIndex(ui->antiAliasing->findText(m_settings->m_antiAliasing));
 
-    QHashIterator<QString, MapSettings::MapItemSettings *> itr(m_settings->m_itemSettings);
+    // Sort groups in table alphabetically
+    QList<MapSettings::MapItemSettings *> itemSettings = m_settings->m_itemSettings.values();
+    std::sort(itemSettings.begin(), itemSettings.end(), 
+        [](const MapSettings::MapItemSettings* a, const MapSettings::MapItemSettings* b) -> bool { 
+            return a->m_group < b->m_group; 
+        });    
+    QListIterator<MapSettings::MapItemSettings *> itr(itemSettings);
     while (itr.hasNext())
     {
-        itr.next();
-        MapSettings::MapItemSettings *itemSettings = itr.value();
+        MapSettings::MapItemSettings *itemSettings = itr.next();
 
         // Add row to table with header
         int row = ui->mapItemSettings->rowCount();
diff --git a/plugins/feature/map/mapsettingsdialog.ui b/plugins/feature/map/mapsettingsdialog.ui
index d99536276..b9426a6d8 100644
--- a/plugins/feature/map/mapsettingsdialog.ui
+++ b/plugins/feature/map/mapsettingsdialog.ui
@@ -16,7 +16,7 @@
    </font>
   </property>
   <property name="windowTitle">
-   <string>Select a Location</string>
+   <string>Map Display Settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -366,6 +366,12 @@
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="maptilerAPIKeyLabel">
+           <property name="minimumSize">
+            <size>
+             <width>140</width>
+             <height>0</height>
+            </size>
+           </property>
            <property name="text">
             <string>Maptiler API Key</string>
            </property>
@@ -380,6 +386,12 @@
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="mapBoxAPIKeyLabel">
+           <property name="minimumSize">
+            <size>
+             <width>140</width>
+             <height>0</height>
+            </size>
+           </property>
            <property name="text">
             <string>Mapbox API Key</string>
            </property>
@@ -394,6 +406,12 @@
          </item>
          <item row="3" column="0">
           <widget class="QLabel" name="cesiumIonAPIKeyLabel">
+           <property name="minimumSize">
+            <size>
+             <width>140</width>
+             <height>0</height>
+            </size>
+           </property>
            <property name="text">
             <string>Cesium Ion API Key</string>
            </property>
@@ -462,6 +480,7 @@
   <tabstop>buildings</tabstop>
   <tabstop>sunLightEnabled</tabstop>
   <tabstop>eciCamera</tabstop>
+  <tabstop>antiAliasing</tabstop>
   <tabstop>thunderforestAPIKey</tabstop>
   <tabstop>maptilerAPIKey</tabstop>
   <tabstop>mapBoxAPIKey</tabstop>
diff --git a/plugins/feature/map/webserver.cpp b/plugins/feature/map/webserver.cpp
index 354ca61b5..f3ba9b799 100644
--- a/plugins/feature/map/webserver.cpp
+++ b/plugins/feature/map/webserver.cpp
@@ -147,11 +147,19 @@ void WebServer::readClient()
 
             // See if we can find the file in our resources
             QResource res(path);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
             if (res.isValid() && (res.uncompressedSize() > 0))
             {
                 QByteArray data = res.uncompressedData();
                 sendFile(socket, data, mimeType, path);
             }
+#else
+            if (res.isValid() && (res.size() > 0))
+            {
+                QByteArray data = QByteArray::fromRawData((const char *)res.data(), res.size());
+                sendFile(socket, data, mimeType, path);
+            }
+#endif
             else
             {
                 // See if we can find a file