diff --git a/src/main.c b/src/main.c
index b8e9ce7..cef1743 100644
--- a/src/main.c
+++ b/src/main.c
@@ -380,13 +380,24 @@ int main(int argc, char **argv) {
                 mvwprintw(win[i], 0, 2, "%s", win_infos[i].title);
                 wrefresh(win[i]);
         }
-        bar_mark(win[4]);
+        tel.speed.lwin = win[0];
+        tel.rpm.lwin = win[1];
+        tel.tq.lwin = win[3];
+        tel.power.lwin = win[4];
+        tel.eff.lwin = win[5];
+        tel.bat.lwin = win[2];
+        tel.bat_temp.lwin = win[6];
+        tel.var_temp.lwin = win[7];
+        tel.mot_temp.lwin = win[8];
+        tel.message.lwin = win[9];
+
+
+        bar_mark(tel.power.lwin);
 
         long t100 = 0, t1000 = 0;
         int ch = ERR;
 
         while(1) {
-
                 ch = tolower(getch());
                 switch (ch) {
                         case 'q' :
@@ -399,35 +410,30 @@ int main(int argc, char **argv) {
                                         //real_data()
                                 }
                                 break;
-
                 }
-
                 long now = now_ms();
-
                 if (now - t100 >= 100 * delay) {
-                        win_int(win[0], tel.speed.data, 3, use_color, color_high(tel.speed.data, tel.speed.ldata, tel.speed.hdata));
-                        win_int(win[1], tel.rpm.data, 4, use_color, color_high(tel.rpm.data, tel.rpm.ldata, tel.rpm.hdata));
-                        win_float(win[3], tel.tq.data, 3, use_color, color_high(tel.tq.data, tel.tq.ldata, tel.tq.hdata));
-                        win_bar(win[4], tel.power.data, tel.power.hdata, use_color, tel.power.digits);
-                        win_float(win[5], tel.eff.data, 5, use_color, color_high(tel.eff.data, tel.eff.ldata, tel.eff.hdata));
+                        win_int(tel.speed.lwin, tel.speed.data, 3, use_color, color_high(tel.speed.data, tel.speed.ldata, tel.speed.hdata));
+                        win_int(tel.rpm.lwin, tel.rpm.data, 4, use_color, color_high(tel.rpm.data, tel.rpm.ldata, tel.rpm.hdata));
+                        win_float(tel.tq.lwin, tel.tq.data, 3, use_color, color_high(tel.tq.data, tel.tq.ldata, tel.tq.hdata));
+                        win_bar(tel.power.lwin, tel.power.data, tel.power.hdata, use_color, tel.power.digits);
+                        win_float(tel.eff.lwin, tel.eff.data, 5, use_color, color_high(tel.eff.data, tel.eff.ldata, tel.eff.hdata));
                         t100 = now;
                 }
                 if (now - t1000 >= 1000 * delay) {
-                        win_int(win[2], tel.bat.data, 3, use_color, color_low(tel.bat.data, tel.bat.ldata, tel.bat.hdata));
-                        win_float(win[6], tel.bat_temp.data, 5, use_color, color_high(tel.bat_temp.data, tel.bat_temp.ldata, tel.bat_temp.hdata));
-                        win_float(win[7], tel.var_temp.data, 5, use_color, color_high(tel.var_temp.data, tel.var_temp.ldata, tel.var_temp.hdata));
-                        win_float(win[8], tel.mot_temp.data, 5, use_color, color_high(tel.mot_temp.data, tel.mot_temp.ldata, tel.mot_temp.hdata));
+                        win_int(tel.bat.lwin, tel.bat.data, 3, use_color, color_low(tel.bat.data, tel.bat.ldata, tel.bat.hdata));
+                        win_float(tel.bat_temp.lwin, tel.bat_temp.data, 5, use_color, color_high(tel.bat_temp.data, tel.bat_temp.ldata, tel.bat_temp.hdata));
+                        win_float(tel.var_temp.lwin, tel.var_temp.data, 5, use_color, color_high(tel.var_temp.data, tel.var_temp.ldata, tel.var_temp.hdata));
+                        win_float(tel.mot_temp.lwin, tel.mot_temp.data, 5, use_color, color_high(tel.mot_temp.data, tel.mot_temp.ldata, tel.mot_temp.hdata));
                         t1000 = now;
                 }
                 //win[9];
                 napms(10);
         };
-        
         end:
         for (int i = 0; i < 10; i++) {
                 delwin(win[i]);
         }
         endwin();
-
         return 0;
 }