diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsconstellationwidget.cpp b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsconstellationwidget.cpp
index d65fddfa0..297d04e44 100644
--- a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsconstellationwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsconstellationwidget.cpp
@@ -129,8 +129,8 @@ void GpsConstellationWidget::updateSat(int index, int prn, int elevation, int az
                        -satIcons[index]->boundingRect().center().y());
         satIcons[index]->setTransform(QTransform::fromTranslate(opd.x(), opd.y()), false);
 
-        // Show normal GPS or SBAS
-        if (prn > 120 && prn < 158) {
+        // Show normal GPS or SBAS (120 - 158 range)
+        if (prn > 119 && prn < 159) {
             if (snr) {
                 satIcons[index]->setElementId("satellite-sbas");
             } else {
diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui
index 49e61ddd4..31ad16a14 100644
--- a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui
+++ b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplaywidget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>768</width>
-    <height>600</height>
+    <width>901</width>
+    <height>651</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -52,7 +52,7 @@
         <widget class="GpsSnrWidget" name="gpsSnrWidget">
          <property name="minimumSize">
           <size>
-           <width>100</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
@@ -133,7 +133,7 @@
           <bool>false</bool>
          </property>
          <property name="frameShape">
-          <enum>QFrame::NoFrame</enum>
+          <enum>QFrame::Panel</enum>
          </property>
          <property name="lineWidth">
           <number>0</number>
@@ -635,7 +635,7 @@
           </spacer>
          </item>
          <item>
-          <layout class="QHBoxLayout" name="horizontalLayout2" stretch="0,0,0,0,0">
+          <layout class="QHBoxLayout" name="horizontalLayout2" stretch="0,0,0,0,0,0">
            <property name="spacing">
             <number>0</number>
            </property>
@@ -694,6 +694,9 @@
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Expanding</enum>
+             </property>
              <property name="sizeHint" stdset="0">
               <size>
                <width>0</width>
@@ -745,6 +748,19 @@
              </property>
             </widget>
            </item>
+           <item>
+            <spacer name="horizontalSpacer_14">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
           </layout>
          </item>
         </layout>
diff --git a/ground/openpilotgcs/src/plugins/gpsdisplay/gpssnrwidget.cpp b/ground/openpilotgcs/src/plugins/gpsdisplay/gpssnrwidget.cpp
index 1dadfbbab..16b04951f 100644
--- a/ground/openpilotgcs/src/plugins/gpsdisplay/gpssnrwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/gpsdisplay/gpssnrwidget.cpp
@@ -104,8 +104,8 @@ void GpsSnrWidget::drawSat(int index)
 
         QRectF boxRect = boxes[index]->boundingRect();
 
-        // Change color for SBAS sat (Egnos, etc..)
-        if (prn > 120 && prn < 158) {
+        // Change color for SBAS sat (Egnos, etc..) 120 - 158 range
+        if (prn > 119 && prn < 159) {
             boxes[index]->setBrush(QColor("#fd700b"));
         } else {
             boxes[index]->setBrush(QColor("Green"));