diff --git a/firmware/applications/final.c b/firmware/applications/final.c
index 3e3bfa5..e270016 100644
--- a/firmware/applications/final.c
+++ b/firmware/applications/final.c
@@ -37,8 +37,8 @@ void main_final(void) {
             getInputWaitRelease();
             init_nick();
         };
+        work_queue();
         fancyNickname();
-        delayms_queue(100);
     };
 };
 
diff --git a/firmware/applications/final/nickname.c b/firmware/applications/final/nickname.c
index 48dde5f..e4dd7b8 100644
--- a/firmware/applications/final/nickname.c
+++ b/firmware/applications/final/nickname.c
@@ -22,12 +22,20 @@ void fancyNickname(void) {
     static uint32_t ctr=0;
 	ctr++;
 
+	setExtFont(GLOBAL(nickfont));
+	dx=DoString(0,0,GLOBAL(nickname));
+    dx=(RESX-dx)/2;
+    if(dx<0)
+        dx=0;
+    dy=(RESY-getFontHeight())/2;
 
 	lcdClear();
-	setExtFont(GLOBAL(nickfont));
 	DoString(dx,dy,GLOBAL(nickname));
 	lcdRefresh();
 
+    while(getInputRaw()==BTN_NONE){
+        work_queue();
+    };
     return;
 }