diff --git a/gtm b/gtm
index 4a4b372..1bfa176 100755
--- a/gtm
+++ b/gtm
@@ -529,10 +529,10 @@ def draw_status_bars(stdscr, state):
             commit_message = parts[3]
     
     # Add wrap indicator and change position to commit message
-    wrap_indicator = " [W] " if state.wrap_lines else " [NW] "
+    wrap_indicator = "" if state.wrap_lines else "[NW] "
     change_indicator = ""
     if state.change_blocks and state.current_change_idx != -1:
-        change_indicator = f" [Block {state.current_change_idx + 1}/{len(state.change_blocks)}] "
+        change_indicator = f"[Change {state.current_change_idx + 1}/{len(state.change_blocks)}] "
     
     commit_message = wrap_indicator + change_indicator + commit_message
     
@@ -576,8 +576,8 @@ def draw_status_bars(stdscr, state):
     # Add commit message in the middle
     if commit_message:
         # Calculate available space
-        left_margin = len(left_status) + 5 if state.show_sidebar else 1  # +5 for the spaces around percentage
-        right_margin = len(right_status) + 5  # +5 for the spaces around percentage
+        left_margin = len(left_status) + 3 if state.show_sidebar else 1  # +3 for the spaces around percentage
+        right_margin = len(right_status) + 3  # +3 for the spaces around percentage
         available_width = state.width - left_margin - right_margin
         
         # Truncate message if needed