diff --git a/main.c b/main.c
index a6291df..16d6a54 100644
--- a/main.c
+++ b/main.c
@@ -165,7 +165,7 @@ static THD_FUNCTION(Thread1, arg)
         else
           redraw_request |= REDRAW_CAL_STATUS | REDRAW_AREA | REDRAW_FREQUENCY;
       }
-      continue;
+//      continue;
     }
 //    START_PROFILE
     // Process UI inputs
@@ -2310,7 +2310,7 @@ static const VNAShellCommand commands[] =
     {"save"        , cmd_save        , 0},
     {"recall"      , cmd_recall      , CMD_WAIT_MUTEX},
 #endif
-    {"trace"       , cmd_trace       , 0},
+    {"trace"       , cmd_trace       , CMD_WAIT_MUTEX},
     {"trigger"     , cmd_trigger     , 0},
     {"marker"      , cmd_marker      , 0},
 #ifdef __VNA__
diff --git a/nanovna.h b/nanovna.h
index 3349edf..7b4a7f7 100644
--- a/nanovna.h
+++ b/nanovna.h
@@ -304,7 +304,7 @@ extern  uint16_t _grid_y;
 #define AREA_WIDTH_NORMAL  (CELLOFFSETX + WIDTH  + 1)
 #define AREA_HEIGHT_NORMAL (              HEIGHT + 1)
 
-#define GRID_X_TEXT       (AREA_WIDTH_NORMAL - 6*5)
+#define GRID_X_TEXT       (AREA_WIDTH_NORMAL - 7*5)
 
 // Smith/polar chart
 #define P_CENTER_X (CELLOFFSETX + WIDTH/2)
diff --git a/plot.c b/plot.c
index 7239f09..57bc38a 100644
--- a/plot.c
+++ b/plot.c
@@ -1958,7 +1958,7 @@ static void cell_grid_line_info(int x0, int y0)
   for (int i = 0; i < NGRIDY; i++){
     if (ypos >= CELLHEIGHT) break;
     if (ypos >= -FONT_GET_HEIGHT){
-      plot_printf(buf, sizeof buf, "% 6.2F", ref);
+      plot_printf(buf, sizeof buf, "% 7.3F", ref);
       cell_drawstring(buf, xpos, ypos);
     }
     ypos+=GRIDY;