diff --git a/kstars/ekos/align/opsastrometry.ui b/kstars/ekos/align/opsastrometry.ui
index 6ecbfd960..7cdbee559 100644
--- a/kstars/ekos/align/opsastrometry.ui
+++ b/kstars/ekos/align/opsastrometry.ui
@@ -1,739 +1,714 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>OpsAstrometry</class>
  <widget class="QWidget" name="OpsAstrometry">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>536</width>
     <height>480</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_5">
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
       <string>Basic Options</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_5">
         <property name="topMargin">
          <number>0</number>
         </property>
         <item>
          <widget class="QCheckBox" name="kcfg_AstrometryUseNoFITS2FITS">
           <property name="toolTip">
            <string>&lt;p&gt;This option should &lt;b&gt;ONLY&lt;/b&gt; be checked if your astrometry.net version is 0.67 or earlier. Uncheck for any versions greater than 0.67&lt;/p&gt;</string>
           </property>
           <property name="text">
            <string>--no-fits2fits</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QCheckBox" name="kcfg_AstrometryUseResort">
           <property name="toolTip">
            <string>Check this option if your image does not have much nebulosity. If it does have strong nebulosity, uncheck it.</string>
           </property>
           <property name="text">
            <string>--resort</string>
           </property>
           <property name="checked">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QCheckBox" name="kcfg_AstrometryUseNoVerify">
           <property name="toolTip">
            <string>This will prevent the solver from looking at an already existing WCS Header before blindly trying to solve the image. It is recommended to keep it checked.</string>
           </property>
           <property name="text">
            <string>--no-verify</string>
           </property>
           <property name="checked">
            <bool>false</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QCheckBox" name="kcfg_AstrometryDetectParity">
           <property name="toolTip">
            <string>Detect parity and reuse it to speed up solver.</string>
           </property>
           <property name="text">
            <string>parity</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QCheckBox" name="checkBox_27">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="toolTip">
-           <string>Prevents creation of unnecessary files unused by Ekos.</string>
-          </property>
-          <property name="text">
-           <string>--no-plots</string>
-          </property>
-          <property name="checked">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="checkBox_30">
-          <property name="enabled">
-           <bool>false</bool>
+         <spacer name="horizontalSpacer_3">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
           </property>
-          <property name="maximumSize">
+          <property name="sizeHint" stdset="0">
            <size>
-            <width>50</width>
-            <height>16777215</height>
+            <width>40</width>
+            <height>20</height>
            </size>
           </property>
-          <property name="toolTip">
-           <string>Overwrite already generated files. It must be checked to prevent solver failure.</string>
-          </property>
-          <property name="text">
-           <string>-O</string>
-          </property>
-          <property name="checked">
-           <bool>false</bool>
-          </property>
-         </widget>
+         </spacer>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Imaging Options</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="2" column="1">
        <widget class="QLabel" name="label_7">
         <property name="toolTip">
          <string>&lt;p&gt;The units of the imager scale bounds above.&lt;/p&gt;
 &lt;ul&gt;
 &lt;li&gt;dw: degree width&lt;/li&gt;
 &lt;li&gt;aw: arcminute width&lt;/li&gt;
 &lt;li&gt;app: arcsecs per pixel&lt;/li&gt;
 &lt;/ul&gt;</string>
         </property>
         <property name="text">
          <string>units</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
       <item row="1" column="4" rowspan="2">
        <widget class="QPushButton" name="updateScale">
         <property name="minimumSize">
          <size>
           <width>22</width>
           <height>22</height>
          </size>
         </property>
         <property name="maximumSize">
          <size>
           <width>22</width>
           <height>22</height>
          </size>
         </property>
         <property name="toolTip">
          <string>Update Image Scale Bounds from the currently active camera and telescope combination.</string>
         </property>
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
       <item row="1" column="2">
        <widget class="QLineEdit" name="lineEdit_42">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="maximumSize">
          <size>
           <width>30</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="toolTip">
          <string>The high end of the imager scale, calculated as a little bigger than the longer dimension of the image.</string>
         </property>
         <property name="text">
          <string>H</string>
         </property>
        </widget>
       </item>
       <item row="2" column="3">
        <widget class="QComboBox" name="kcfg_AstrometryImageScaleUnits">
         <property name="maximumSize">
          <size>
           <width>110</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="toolTip">
          <string>&lt;p&gt;The units of the imager scale bounds above.&lt;/p&gt;
 &lt;ul&gt;
 &lt;li&gt;dw: degree width&lt;/li&gt;
 &lt;li&gt;aw: arcminute width&lt;/li&gt;
 &lt;li&gt;app: arcsecs per pixel&lt;/li&gt;
 &lt;/ul&gt;</string>
         </property>
         <property name="currentIndex">
          <number>0</number>
         </property>
         <item>
          <property name="text">
           <string>dw</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>aw</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>app</string>
          </property>
         </item>
        </widget>
       </item>
       <item row="3" column="3">
        <widget class="QSpinBox" name="kcfg_AstrometryDownsample">
         <property name="minimum">
          <number>2</number>
         </property>
         <property name="maximum">
          <number>16</number>
         </property>
         <property name="value">
          <number>2</number>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
        <widget class="QCheckBox" name="kcfg_AstrometryUseDownsample">
         <property name="toolTip">
          <string>Downsample the image to shrink its size and speed up the solver.</string>
         </property>
         <property name="text">
          <string>Down Sample</string>
         </property>
         <property name="checked">
          <bool>false</bool>
         </property>
        </widget>
       </item>
       <item row="0" column="0">
        <widget class="QCheckBox" name="kcfg_AstrometryUseImageScale">
         <property name="toolTip">
          <string>Set image scale to speed up solver as it does not have to search index files of different image scales.</string>
         </property>
         <property name="text">
          <string>Use Scale</string>
         </property>
         <property name="checked">
          <bool>false</bool>
         </property>
        </widget>
       </item>
       <item row="0" column="2">
        <widget class="QLineEdit" name="lineEdit_41">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="maximumSize">
          <size>
           <width>30</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="toolTip">
          <string>The lower end of the imager scale, calculated as a little smaller than the shorter dimension of the image.</string>
         </property>
         <property name="text">
          <string>L</string>
         </property>
        </widget>
       </item>
       <item row="0" column="3">
        <widget class="QDoubleSpinBox" name="kcfg_AstrometryImageScaleLow">
         <property name="decimals">
          <number>3</number>
         </property>
         <property name="minimum">
          <double>0.000000000000000</double>
         </property>
         <property name="maximum">
          <double>999.000000000000000</double>
         </property>
         <property name="value">
          <double>30.000000000000000</double>
         </property>
        </widget>
       </item>
       <item row="3" column="1" colspan="2">
        <widget class="QLineEdit" name="lineEdit_55">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="toolTip">
          <string>Downsample the image to shrink its size and speed up the solver.</string>
         </property>
         <property name="text">
          <string>downsample</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
       <item row="1" column="3">
        <widget class="QDoubleSpinBox" name="kcfg_AstrometryImageScaleHigh">
         <property name="decimals">
          <number>3</number>
         </property>
         <property name="minimum">
          <double>0.000000000000000</double>
         </property>
         <property name="maximum">
          <double>999.000000000000000</double>
         </property>
         <property name="value">
          <double>40.000000000000000</double>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLabel" name="label_13">
         <property name="toolTip">
          <string>The high end of the imager scale, calculated as a little bigger than the longer dimension of the image.</string>
         </property>
         <property name="text">
          <string>High</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QCheckBox" name="kcfg_AstrometryAutoUpdateImageScale">
           <property name="toolTip">
            <string>Automatically update image scale values when CCD and/or Mount parameters are updated.</string>
           </property>
           <property name="text">
            <string>Auto Update</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLabel" name="imageWarningLabel">
           <property name="enabled">
            <bool>true</bool>
           </property>
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="minimumSize">
            <size>
             <width>22</width>
             <height>22</height>
            </size>
           </property>
           <property name="maximumSize">
            <size>
             <width>22</width>
             <height>22</height>
            </size>
           </property>
           <property name="toolTip">
            <string>Image Scale Auto Update is turned off.</string>
           </property>
           <property name="text">
            <string/>
           </property>
           <property name="pixmap">
            <pixmap resource="../../data/kstars.qrc">:/icons/AlignWarning.svg</pixmap>
           </property>
           <property name="scaledContents">
            <bool>true</bool>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item row="2" column="2">
        <widget class="QLineEdit" name="lineEdit_50">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="maximumSize">
          <size>
           <width>30</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="toolTip">
          <string>&lt;p&gt;The units of the imager scale bounds above.&lt;/p&gt;
 &lt;ul&gt;
 &lt;li&gt;dw: degree width&lt;/li&gt;
 &lt;li&gt;aw: arcminute width&lt;/li&gt;
 &lt;/ul&gt;</string>
         </property>
         <property name="text">
          <string>u</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLabel" name="label_12">
         <property name="toolTip">
          <string>The lower end of the imager scale, calculated as a little smaller than the shorter dimension of the image.</string>
         </property>
         <property name="text">
          <string>Low</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
       </item>
       <item row="1" column="5">
        <spacer name="horizontalSpacer">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Position Options</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="1" column="0">
        <widget class="QCheckBox" name="kcfg_AstrometryUsePosition">
         <property name="toolTip">
          <string>Set estimated position to speed up astrometry solver as it does not have to search in other areas of the sky.</string>
         </property>
         <property name="text">
          <string>Use Position</string>
         </property>
         <property name="checked">
          <bool>false</bool>
         </property>
        </widget>
       </item>
       <item row="3" column="2">
        <widget class="QLineEdit" name="lineEdit_44">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="maximumSize">
          <size>
           <width>30</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="toolTip">
          <string>The Search Radius for the Estimated Telescope/Image Field Position in degrees.</string>
         </property>
         <property name="text">
          <string>5</string>
         </property>
        </widget>
       </item>
       <item row="3" column="3">
        <widget class="QDoubleSpinBox" name="kcfg_AstrometryRadius">
         <property name="minimum">
          <double>1.000000000000000</double>
         </property>
         <property name="maximum">
          <double>360.000000000000000</double>
         </property>
         <property name="value">
          <double>30.000000000000000</double>
         </property>
        </widget>
       </item>
       <item row="1" column="2">
        <widget class="QLineEdit" name="lineEdit_47">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="maximumSize">
          <size>
           <width>30</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="toolTip">
          <string>The RA of the Estimated Telescope/Image Field Position in hh:mm:ss notation</string>
         </property>
         <property name="text">
          <string>3</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="QLabel" name="label_15">
         <property name="toolTip">
          <string>The DEC of the Estimated Telescope/Image Field Position in dd:mm:ss notation</string>
         </property>
         <property name="text">
          <string>DEC</string>
         </property>
        </widget>
       </item>
       <item row="1" column="3">
        <widget class="dmsBox" name="estRA">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="toolTip">
          <string>The RA of the Estimated Telescope/Image Field Position in hh:mm:ss notation</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLabel" name="label_14">
         <property name="toolTip">
          <string>The RA of the Estimated Telescope/Image Field Position in hh:mm:ss notation</string>
         </property>
         <property name="text">
          <string>RA</string>
         </property>
        </widget>
       </item>
       <item row="2" column="4" rowspan="2">
        <widget class="QPushButton" name="updatePosition">
         <property name="minimumSize">
          <size>
           <width>22</width>
           <height>22</height>
          </size>
         </property>
         <property name="maximumSize">
          <size>
           <width>22</width>
           <height>22</height>
          </size>
         </property>
         <property name="toolTip">
          <string>Update coordinates to the current telescope position</string>
         </property>
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
       <item row="2" column="5">
        <spacer name="horizontalSpacer_2">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
       <item row="3" column="1">
        <widget class="QLabel" name="label_8">
         <property name="toolTip">
          <string>The Search Radius for the Estimated Telescope/Image Field Position in degrees.</string>
         </property>
         <property name="text">
          <string>Radius</string>
         </property>
        </widget>
       </item>
       <item row="2" column="3">
        <widget class="dmsBox" name="estDec">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="minimumSize">
          <size>
           <width>70</width>
           <height>0</height>
          </size>
         </property>
         <property name="toolTip">
          <string>The DEC of the Estimated Telescope/Image Field Position in dd:mm:ss notation</string>
         </property>
        </widget>
       </item>
       <item row="4" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
       <item row="2" column="2">
        <widget class="QLineEdit" name="lineEdit_48">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="maximumSize">
          <size>
           <width>30</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="toolTip">
          <string>The DEC of the Estimated Telescope/Image Field Position in dd:mm:ss notation</string>
         </property>
         <property name="text">
          <string>4</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <item>
          <widget class="QCheckBox" name="kcfg_AstrometryAutoUpdatePosition">
           <property name="toolTip">
            <string>Automatically update position coordinates when mount completes slewing.</string>
           </property>
           <property name="text">
            <string>Auto Update</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLabel" name="positionWarningLabel">
           <property name="enabled">
            <bool>true</bool>
           </property>
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="minimumSize">
            <size>
             <width>22</width>
             <height>22</height>
            </size>
           </property>
           <property name="maximumSize">
            <size>
             <width>22</width>
             <height>22</height>
            </size>
           </property>
           <property name="toolTip">
            <string>Position Auto Update is turned off.</string>
           </property>
           <property name="text">
            <string/>
           </property>
           <property name="pixmap">
            <pixmap resource="../../data/kstars.qrc">:/icons/AlignWarning.svg</pixmap>
           </property>
           <property name="scaledContents">
            <bool>true</bool>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item row="0" column="0" colspan="6">
        <widget class="QCheckBox" name="kcfg_AstrometryDifferentialSlewing">
         <property name="toolTip">
          <string>Do not use Sync when Slew to Target is selected. Use differential slewing to correct for discrepancies. This is useful on some mounts (e.g. Paramount).</string>
         </property>
         <property name="text">
          <string>Use differential slewing instead of syncing</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <layout class="QFormLayout" name="formLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label_3">
        <property name="text">
         <string>Custom:</string>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="QLineEdit" name="kcfg_AstrometryCustomOptions">
        <property name="toolTip">
         <string>Additional optional astrometry.net options.</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <spacer name="verticalSpacer_4">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>dmsBox</class>
    <extends>QLineEdit</extends>
    <header>widgets/dmsbox.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources>
   <include location="../../data/kstars.qrc"/>
  </resources>
  <connections/>
 </ui>