diff --git a/fcore/normal-mode/normal-search-finish.sml b/fcore/normal-mode/normal-search-finish.sml
index f120b10..82921d7 100644
--- a/fcore/normal-mode/normal-search-finish.sml
+++ b/fcore/normal-mode/normal-search-finish.sml
@@ -77,7 +77,8 @@ struct
         , cursor :: initialTextAcc
         )
       val drawMsg = Vector.concat drawMsg
-      val msgs = [DrawMsg.DRAW_TEXT drawMsg]
+      val drawMsg = DrawMsg.DRAW_TEXT drawMsg
+      val msgs = [MailboxType.DRAW drawMsg]
     in
       NormalSearchModeWith.changeTempSearchString
         (app, buffer, startLine, mode, msgs)
@@ -150,7 +151,8 @@ struct
         , cursor :: initialTextAcc
         )
       val drawMsg = Vector.concat drawMsg
-      val msgs = [DrawMsg.DRAW_TEXT drawMsg]
+      val drawMsg = DrawMsg.DRAW_TEXT drawMsg
+      val msgs = [MailboxType.DRAW drawMsg]
     in
       NormalSearchModeWith.bufferAndSize
         (app, buffer, newWindowWidth, newWindowHeight, msgs)
diff --git a/fcore/normal-mode/normal-search-mode.sml b/fcore/normal-mode/normal-search-mode.sml
index 1a40718..6292cb1 100644
--- a/fcore/normal-mode/normal-search-mode.sml
+++ b/fcore/normal-mode/normal-search-mode.sml
@@ -47,7 +47,15 @@ struct
   (* save search string and tempSearchList and return to normal mode *)
   fun saveSearch (app: app_type, searchString, tempSearchList, time) =
     let
-      val {buffer, cursorIdx, windowWidth, windowHeight, startLine, ...} = app
+      val
+        { buffer
+        , cursorIdx
+        , windowWidth
+        , windowHeight
+        , startLine
+        , visualScrollColumn
+        , ...
+        } = app
 
       val buffer = LineGap.goToStart buffer
       val searchString = EscapeString.unescape searchString
@@ -63,7 +71,7 @@ struct
       (* move buffer to new startLine as required by TextBuilder.build *)
       val buffer = LineGap.goToLine (startLine, buffer)
 
-      val msgs = TextBuilder.build
+      val drawMsg = NormalModeTextBuilder.build
         ( startLine
         , cursorIdx
         , buffer
@@ -71,8 +79,11 @@ struct
         , windowHeight
         , tempSearchList
         , searchString
-        , initialMsg
+        , visualScrollColumn
         )
+      val drawMsg = Vector.concat drawMsg
+      val drawMsg = DrawMsg.DRAW_TEXT drawMsg
+      val msgs = DRAW drawMsg :: initialMsg
 
       val mode = NORMAL_MODE ""
     in
diff --git a/fcore/text-builder/text-builder-with-cursor.sml b/fcore/text-builder/text-builder-with-cursor.sml
index 71ea952..2812400 100644
--- a/fcore/text-builder/text-builder-with-cursor.sml
+++ b/fcore/text-builder/text-builder-with-cursor.sml
@@ -207,7 +207,8 @@ struct
                 in Utils.makeCursorOnChr (chr, posX, posY, env) :: acc
                 end
               else
-                Utils.makeCursor (posX, posY, env) :: acc
+                Utils.makeChr (chr, posX, posY, env)
+                :: Utils.makeCursor (posX, posY, env) :: acc
           in
             build
               ( pos + 1
diff --git a/fcore/text-builder/text-builder-with-highlight.sml b/fcore/text-builder/text-builder-with-highlight.sml
index ec7eaa6..53749e4 100644
--- a/fcore/text-builder/text-builder-with-highlight.sml
+++ b/fcore/text-builder/text-builder-with-highlight.sml
@@ -276,7 +276,7 @@ struct
                     Utils.makeHighlightChr (chr, posX, posY, env)
                     :: Utils.makeHighlight (posX, posY, env) :: acc
                   else
-                    acc
+                    Utils.makeChr (chr, posX, posY, env) :: acc
               in
                 build
                   ( pos + 1
diff --git a/shell/gl-draw.sml b/shell/gl-draw.sml
index 9d35041..3915fc8 100644
--- a/shell/gl-draw.sml
+++ b/shell/gl-draw.sml
@@ -152,7 +152,7 @@ struct
         let
           val shellState = consumeDrawEvents shellState
 
-          val _ = Gles3.clearColor (0.087, 0.095, 0.13, 1.0)
+          val _ = Gles3.clearColor (0.3, 0.3, 0.3, 1.0)
           val _ = Gles3.clear ()
 
           val app = update app