Index: test-joydev.c
===================================================================
--- test-joydev.c	(revision 951)
+++ test-joydev.c	(revision 952)
@@ -20,6 +20,7 @@
 if(raydium_joy)
     {
     int a,b,c;
+    int x,y;
 
     // General device information.
     raydium_osd_printf(2,98,16,0.5,"font2.tga","^F%s^F",raydium_joy_name);
@@ -41,10 +42,14 @@
         raydium_osd_printf(2,47-a*3,16,0.5,"font2.tga","^%cA%02i %+.10f^F",(raydium_joy_n_axes>a)?'F':'8',a,raydium_joy_axis[a]);
 
     // Show button states of all available buttons.
-    raydium_osd_printf(2,8,16,0.5,"font2.tga","^FB U T T O N S^F");
-    raydium_osd_printf(2,5,16,0.5,"font2.tga","^F#%02i click value^F",raydium_joy_click);
-    for(b=0;b<RAYDIUM_JOY_MAX_BUTTONS;b++)
-        raydium_osd_printf(2+b*5,2,16,0.5,"font2.tga","^%cB%02i^F",(raydium_joy_button[b])?(char)raydium_random_i('0','F'):(raydium_joy_n_buttons>b)?'F':'8',b);
+    raydium_osd_printf(2,11,16,0.5,"font2.tga","^FB U T T O N S^F");
+    raydium_osd_printf(2,8,16,0.5,"font2.tga","^F#%02i click value^F",raydium_joy_click);
+    for(b=0,x=2,y=5;b<RAYDIUM_JOY_MAX_BUTTONS;b++)
+        {
+        raydium_osd_printf(x,y,16,0.5,"font2.tga","^%cB%02i^F",(raydium_joy_button[b])?(char)raydium_random_i('0','F'):(raydium_joy_n_buttons>b)?'F':'8',b);
+        x+=5;
+        if(x>95) { x=2; y-=3; }
+        }
     }
 else
     {