diff --git a/artwork/weapons_AW6_mod.fnt b/artwork/weapons_AW6_mod.fnt
index 251c7c7..272cc87 100644
Binary files a/artwork/weapons_AW6_mod.fnt and b/artwork/weapons_AW6_mod.fnt differ
diff --git a/display_main_menu.asm b/display_main_menu.asm
index 8484f14..c0f923d 100644
--- a/display_main_menu.asm
+++ b/display_main_menu.asm
@@ -29,9 +29,9 @@ OptionsScreenEnd
 
 ;-----------------------------------------------
 NameScreen2
- dta d"   Tank  01    Name:"
+ dta d"  Tank 1  * 1   Name:"
 NameAdr
- dta                     d"            "
+ dta                      d"           "
 NameScreen4
  dta d" "
 NamesOfLevels
diff --git a/scorch.xex b/scorch.xex
index 27e81a9..04f1b08 100644
Binary files a/scorch.xex and b/scorch.xex differ
diff --git a/textproc.asm b/textproc.asm
index 6f9fc51..262d957 100644
--- a/textproc.asm
+++ b/textproc.asm
@@ -1116,10 +1116,8 @@ NoArrowDown
     ldx tanknr
     lda skillTable,x
     sta difficultyLevel
-    inx
-    stx decimal
-    mwa #(NameScreen2+9) displayposition
-    jsr displaybyte
+	lda digits+1,x
+    sta NameScreen2+7
     jsr HighlightLevel ; setting choosen level of the opponent (Moron, etc)
 
     ; clear tank name editor field - not necessary
@@ -1160,6 +1158,11 @@ LastNameChar
 
 
 CheckKeys
+	ldx TankNr
+	lda JoyNumber,x
+    tax
+	lda digits+1,x
+    sta NameScreen2+12	
 	jsr CursorDisplay
     jsr getkey
     bit escFlag
@@ -1190,7 +1193,7 @@ CheckFurtherX01 ; here we check Tab, Return and Del
     cmp #@kbcode._ret  ; $0c ; Return
     jeq EndOfNick
     cmp #@kbcode._tab  ; $2c ; Tab
-    beq ChangeOfLevelUp
+    beq ChangeOfJoyUp
     cmp #@kbcode._right  ; $7 ;cursor right
     beq ChangeOfLevelUp
     cmp #@kbcode._left  ; $6 ;cursor left
@@ -1218,6 +1221,10 @@ FirstChar
     lda #0
     sta NameAdr,x
     jmp CheckKeys
+ChangeOfJoyUp
+	ldx TankNr
+	inc JoyNumber,x
+    jmp CheckKeys
 ChangeOfLevelUp ; change difficulty level of computer opponent
     inc:lda DifficultyLevel
     cmp #9  ; 9 levels are possible
diff --git a/variables.asm b/variables.asm
index efb6a38..36e8192 100644
--- a/variables.asm
+++ b/variables.asm
@@ -159,6 +159,8 @@ ytankstable ;Y positions of tanks (lower left point)
     .DS MaxPlayers
 LowResDistances ; coarse tank positions divided by 4 (to be in just one byte)
     .DS MaxPlayers
+JoyNumber	; Joystick port number (from 0 to 3 or 1)
+	.DS MaxPlayers
 ;----------------------------------------------------
 TargetTankNr	; Target tank index (for AI routines)
 	.DS 1