diff --git a/lib/astrosub.f90 b/lib/astrosub.f90
index 5e7f473f0..0ca7b49cd 100644
--- a/lib/astrosub.f90
+++ b/lib/astrosub.f90
@@ -4,6 +4,9 @@ module astro_module
   private
   public :: astrosub
 
+  logical :: initialized = .false.
+  integer :: azel_extra_lines = 0
+
 contains
 
   subroutine astrosub(nyear,month,nday,uth8,freq8,mygrid_cp,                    &
@@ -28,11 +31,18 @@ contains
     character(len=6) :: mygrid, hisgrid
     character(len=:), allocatable :: AzElFileName
     character(len=1) :: c1
-    integer :: ih, im, imin, is, isec, nfreq, nRx
+    character(len=32) :: envvar
+    integer :: ih, im, imin, is, isec, nfreq, env_status
     real(dp) :: AzAux, ElAux, dbMoon8, dfdt, dfdt0, doppler, doppler00, HA8, sd8, xlst8
     character*256 jpleph_file_name
     common/jplcom/jpleph_file_name
 
+    if (.not.initialized) then
+       call get_environment_variable ('WSJT_AZEL_EXTRA_LINES', envvar, status=env_status)
+       if (env_status.eq.0) read (envvar, *, iostat=env_status) azel_extra_lines
+       initialized = .true.
+    end if
+
     mygrid = mygrid_cp
     hisgrid = hisgrid_cp
     AzElFileName = C_string_value (AzElFileName_cp)
@@ -51,10 +61,8 @@ contains
     is=mod(isec,60)
     open(15,file=AzElFileName,status='unknown',err=900)
     c1='R'
-    nRx=1
     if(bTx) then
        c1='T'
-       nRx=0
     endif
     AzAux=0.
     ElAux=0.
@@ -65,13 +73,13 @@ contains
          ih,im,is,AzSun8,ElSun8,                                        &
          ih,im,is,AzAux,ElAux,                                          &
          nfreq,doppler,dfdt,doppler00,dfdt0,c1
-    !       TXFirst,TRPeriod,poloffset,Dgrd,xnr,ave,rms,nRx
+    if (azel_extra_lines.ge.1) write(15, 1020, err=10) poloffset8,xnr8,Dgrd8
 1010 format(                                                          &
          i2.2,':',i2.2,':',i2.2,',',f5.1,',',f5.1,',Moon'/               &
          i2.2,':',i2.2,':',i2.2,',',f5.1,',',f5.1,',Sun'/                &
          i2.2,':',i2.2,':',i2.2,',',f5.1,',',f5.1,',Source'/             &
          i5,',',f8.1,',',f8.2,',',f8.1,',',f8.2,',Doppler, ',a1)
-    !      i1,',',i3,',',f8.1,','f8.1,',',f8.1,',',f12.3,',',f12.3,',',i1,',RPol')
+1020 format(f8.1,','f8.1,',',f8.1,',Pol')
 10  close(15)
     go to 999
 
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 305d18d13..5502f69f5 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -5204,6 +5204,12 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
   lookup();
   m_hisGrid = ui->dxGridEntry->text();
 
+  if (m_bDoubleClicked)
+    {
+      // extract our report if present
+      message.report (m_baseCall, Radio::base_callsign(ui->dxCallEntry->text()), m_rptRcvd);
+    }
+
   if (!m_bSentReport || base_call != qso_partner_base_call) // Don't change report within a QSO
     {
       auto n = message.report ().toInt ();
diff --git a/widgets/mainwindow.ui b/widgets/mainwindow.ui
index ef9c32bd9..07c943c64 100644
--- a/widgets/mainwindow.ui
+++ b/widgets/mainwindow.ui
@@ -552,7 +552,7 @@
         </layout>
        </item>
        <item>
-        <layout class="QGridLayout" name="gridLayout_5" rowstretch="1,0,0" columnstretch="0,0,1,5,0">
+        <layout class="QGridLayout" name="gridLayout_5" rowstretch="1,0,0" columnstretch="0,0,1,4,0">
          <item row="0" column="1" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
           <widget class="QPushButton" name="readFreq">
            <property name="enabled">
@@ -1276,23 +1276,17 @@ When not checked you can view the calibration results.</string>
                       <item>
                        <widget class="QPushButton" name="pbR2T">
                         <property name="sizePolicy">
-                         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+                         <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
                           <horstretch>0</horstretch>
                           <verstretch>0</verstretch>
                          </sizepolicy>
                         </property>
                         <property name="minimumSize">
                          <size>
-                          <width>20</width>
+                          <width>35</width>
                           <height>0</height>
                          </size>
                         </property>
-                        <property name="maximumSize">
-                         <size>
-                          <width>50</width>
-                          <height>20</height>
-                         </size>
-                        </property>
                         <property name="toolTip">
                          <string>Set Tx frequency to Rx Frequency</string>
                         </property>
@@ -1329,23 +1323,17 @@ When not checked you can view the calibration results.</string>
                       <item>
                        <widget class="QPushButton" name="pbT2R">
                         <property name="sizePolicy">
-                         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+                         <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
                           <horstretch>0</horstretch>
                           <verstretch>0</verstretch>
                          </sizepolicy>
                         </property>
                         <property name="minimumSize">
                          <size>
-                          <width>20</width>
+                          <width>35</width>
                           <height>0</height>
                          </size>
                         </property>
-                        <property name="maximumSize">
-                         <size>
-                          <width>50</width>
-                          <height>20</height>
-                         </size>
-                        </property>
                         <property name="toolTip">
                          <string>Set Rx frequency to Tx Frequency</string>
                         </property>
@@ -1980,12 +1968,6 @@ Double click to toggle the use of the Tx1 message to start a QSO with a station
                       </item>
                       <item row="5" column="0">
                        <widget class="QComboBox" name="tx5">
-                        <property name="sizePolicy">
-                         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                          <horstretch>0</horstretch>
-                          <verstretch>0</verstretch>
-                         </sizepolicy>
-                        </property>
                         <property name="toolTip">
                          <string>Enter a free text message (maximum 13 characters)
 or select a predefined macro from the dropdown list.
@@ -1998,6 +1980,9 @@ list. The list can be maintained in Settings (F2).</string>
                         <property name="insertPolicy">
                          <enum>QComboBox::InsertAtBottom</enum>
                         </property>
+                        <property name="sizeAdjustPolicy">
+                         <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+                        </property>
                        </widget>
                       </item>
                       <item row="5" column="1">
@@ -2028,7 +2013,7 @@ Double-click to reset to the standard 73 message</string>
                    <attribute name="title">
                     <string>2</string>
                    </attribute>
-                   <layout class="QGridLayout" name="gridLayout_11">
+                   <layout class="QGridLayout" name="gridLayout_11" columnstretch="1,0">
                     <item row="0" column="1" rowspan="2">
                      <layout class="QGridLayout" name="gridLayout_10">
                       <item row="2" column="0">
@@ -2308,6 +2293,9 @@ Double-click to reset to the standard 73 message</string>
                         <height>16777215</height>
                        </size>
                       </property>
+                      <property name="sizeAdjustPolicy">
+                       <enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum>
+                      </property>
                      </widget>
                     </item>
                    </layout>
@@ -2875,14 +2863,6 @@ Yellow when too low</string>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menuBar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>968</width>
-     <height>21</height>
-    </rect>
-   </property>
    <widget class="QMenu" name="menuFile">
     <property name="title">
      <string>File</string>