diff --git a/src/Zenith/CLI.hs b/src/Zenith/CLI.hs
index a324b38..8ecd3d0 100644
--- a/src/Zenith/CLI.hs
+++ b/src/Zenith/CLI.hs
@@ -308,7 +308,7 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
     helpDialog st =
       if st ^. helpBox
         then D.renderDialog
-               (D.dialog (Just (str "Commands")) Nothing 55)
+               (D.dialog (Just (str " Commands ")) Nothing 55)
                (vBox ([C.hCenter $ str "Key", B.hBorder] <> keyList) <+>
                 vBox ([str "Actions", B.hBorder] <> actionList))
         else emptyWidget
@@ -331,20 +331,20 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
       case st ^. dialogBox of
         WName ->
           D.renderDialog
-            (D.dialog (Just (str "Create Wallet")) Nothing 50)
+            (D.dialog (Just (str " Create Wallet ")) Nothing 50)
             (renderForm $ st ^. inputForm)
         AName ->
           D.renderDialog
-            (D.dialog (Just (str "Create Account")) Nothing 50)
+            (D.dialog (Just (str " Create Account ")) Nothing 50)
             (renderForm $ st ^. inputForm)
         AdName ->
           D.renderDialog
-            (D.dialog (Just (str "Create Address")) Nothing 50)
+            (D.dialog (Just (str " Create Address ")) Nothing 50)
             (renderForm $ st ^. inputForm)
         WSelect ->
           D.renderDialog
-            (D.dialog (Just (str "Select Wallet")) Nothing 50)
-            (selectListBox "Wallets" (st ^. wallets) listDrawWallet <=>
+            (D.dialog (Just (str " Select Wallet ")) Nothing 50)
+            (selectListBox " Wallets " (st ^. wallets) listDrawWallet <=>
              C.hCenter
                (hBox
                   [ capCommand "↑↓ " "move"
@@ -355,8 +355,8 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
                   ]))
         ASelect ->
           D.renderDialog
-            (D.dialog (Just (str "Select Account")) Nothing 50)
-            (selectListBox "Accounts" (st ^. accounts) listDrawAccount <=>
+            (D.dialog (Just (str " Select Account ")) Nothing 50)
+            (selectListBox " Accounts " (st ^. accounts) listDrawAccount <=>
              C.hCenter
                (hBox
                   [ capCommand "↑↓ " "move"
@@ -366,7 +366,7 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
                   ]))
         SendTx ->
           D.renderDialog
-            (D.dialog (Just (str "Send Transaction")) Nothing 50)
+            (D.dialog (Just (str " Send Transaction ")) Nothing 50)
             (renderForm (st ^. txForm) <=>
              C.hCenter
                (hBox [capCommand "↲ " "Send", capCommand "<esc> " "Cancel"]))
@@ -489,7 +489,7 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
             Just (_, w) ->
               withBorderStyle unicodeBold $
               D.renderDialog
-                (D.dialog (Just $ txt "Seed Phrase") Nothing 50)
+                (D.dialog (Just $ txt " Seed Phrase ") Nothing 50)
                 (padAll 1 $
                  txtWrap $
                  E.decodeUtf8Lenient $
@@ -498,12 +498,12 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
         MsgDisplay ->
           withBorderStyle unicodeBold $
           D.renderDialog
-            (D.dialog (Just $ txt "Message") Nothing 50)
+            (D.dialog (Just $ txt " Message ") Nothing 50)
             (padAll 1 $ strWrap $ st ^. msg)
         TxIdDisplay ->
           withBorderStyle unicodeBold $
           D.renderDialog
-            (D.dialog (Just $ txt "Success") Nothing 50)
+            (D.dialog (Just $ txt " Success ") Nothing 50)
             (padAll 1 $
              (txt "Tx ID: " <+>
               txtWrapWith
@@ -516,7 +516,7 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
             Just (_, tx) ->
               withBorderStyle unicodeBold $
               D.renderDialog
-                (D.dialog (Just $ txt "Transaction") Nothing 50)
+                (D.dialog (Just $ txt " Transaction ") Nothing 50)
                 (padAll
                    1
                    (str
@@ -542,7 +542,7 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
         SyncDisplay ->
           withBorderStyle unicodeBold $
           D.renderDialog
-            (D.dialog (Just $ txt "Sync") Nothing 50)
+            (D.dialog (Just $ txt " Sync ") Nothing 50)
             (padAll
                1
                (updateAttrMap
@@ -556,7 +556,7 @@ drawUI s = [splashDialog s, helpDialog s, displayDialog s, inputDialog s, ui s]
         SendDisplay ->
           withBorderStyle unicodeBold $
           D.renderDialog
-            (D.dialog (Just $ txt "Sending Transaction") Nothing 50)
+            (D.dialog (Just $ txt " Sending Transaction ") Nothing 50)
             (padAll
                1
                (strWrapWith
@@ -994,7 +994,7 @@ appEvent (BT.VtyEvent e) = do
                        V.EvKey (V.KChar 'n') [] -> do
                          BT.modify $
                            set inputForm $
-                           updateFormState (DialogInput "New Wallet") $
+                           updateFormState (DialogInput " New Wallet ") $
                            s ^. inputForm
                          BT.modify $ set dialogBox WName
                        V.EvKey (V.KChar 's') [] ->
@@ -1011,7 +1011,7 @@ appEvent (BT.VtyEvent e) = do
                        V.EvKey (V.KChar 'n') [] -> do
                          BT.modify $
                            set inputForm $
-                           updateFormState (DialogInput "New Account") $
+                           updateFormState (DialogInput " New Account ") $
                            s ^. inputForm
                          BT.modify $ set dialogBox AName
                        ev -> BT.zoom accounts $ L.handleListEvent ev