diff --git a/src/c/main.c b/src/c/main.c
index 4888435..f5cf9c8 100644
--- a/src/c/main.c
+++ b/src/c/main.c
@@ -91,16 +91,16 @@ void window_load(Window *window) {
 #endif
 	neat_bar_layer_add_to_window(s_neat_bar_layer, window);
 
-#if PBL_DISPLAY_HEIGHT >= 260
+#if PBL_DISPLAY_HEIGHT >= 260 && PBL_ROUND
 #define W_OFFSET 20 // TODO
 #define Y_OFFSET 19 // TODO
-#elif PBL_DISPLAY_HEIGHT >= 228
+#elif PBL_DISPLAY_HEIGHT >= 228 && PBL_RECT
 #define W_OFFSET 28
 #define Y_OFFSET 17
-#elif PBL_DISPLAY_HEIGHT >= 180
-#define W_OFFSET 20 // TODO
-#define Y_OFFSET 19 // TODO
-#else               // 144x168
+#elif PBL_DISPLAY_HEIGHT >= 180 && PBL_ROUND
+#define W_OFFSET 40
+#define Y_OFFSET 27
+#else // 144x168
 #define W_OFFSET 20
 #define Y_OFFSET 19
 #endif