diff --git a/inc/logic/logic.meter.lua b/inc/logic/logic.meter.lua
index 0fb3c23..ad64d67 100644
--- a/inc/logic/logic.meter.lua
+++ b/inc/logic/logic.meter.lua
@@ -131,7 +131,9 @@ function Meter.draw()
   local bar_x = 182
   local label_x = 228
   local line_h = 5
-  local start_y = 11
+  local start_y = 1
+
+
   local bar_offset = math.floor((line_h - bar_h) / 2)
 
   local meter_list = {
diff --git a/inc/logic/logic.timer.lua b/inc/logic/logic.timer.lua
index 943a85c..3493aec 100644
--- a/inc/logic/logic.timer.lua
+++ b/inc/logic/logic.timer.lua
@@ -43,7 +43,7 @@ function Timer.draw()
   if Context.meters.hidden and not Context.stat_screen_active then return end
 
   local cx = 10
-  local cy = 20
+  local cy = 8
   local r_outer = 5
   local r_inner = 3
   local progress = Context.timer.progress
diff --git a/inc/window/window.game.lua b/inc/window/window.game.lua
index d6241ed..5abc065 100644
--- a/inc/window/window.game.lua
+++ b/inc/window/window.game.lua
@@ -6,12 +6,12 @@ local _selected_decision_index = 1
 --- @within GameWindow
 function GameWindow.draw()
   local screen = Screen.get_by_id(Context.game.current_screen)
+  if not screen then return end
   if screen.background then
     Map.draw(screen.background)
   elseif screen.background_color then
     rect(0, 0, Config.screen.width, Config.screen.height, screen.background_color)
   end
-  UI.draw_top_bar(screen.name)
   if not Context.stat_screen_active and #_available_decisions > 0 then
     Decision.draw(_available_decisions, _selected_decision_index)
   end