diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f0a9200eb..e1e4d899a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D1X-Rebirth Changelog
 20080129
 --------
 SConstruct, arch/include/digi_audio.h, arch/include/digi_mixer.h, arch/include/digi_mixer_music.h, arch/include/event.h, arch/include/joy.h, arch/include/joystick.h, arch/include/jukebox.h, arch/include/key.h, arch/include/mouse.h, arch/linux/include/music.h, arch/ogl/gr.c, arch/ogl/ogl.c, arch/ogl/sdlgl.c, arch/sdl/mouse.c, include/internal.h, include/loadgl.h, include/ogl_init.h, main/kconfig.c: Cleanung up arch/ a little bit; Added mouse delta time interval for more more accurate reading at high FPS
+SConstruct, main/netdrv_udp.c, main/netdrv_udp.h, main/newmenu.c: Renaming udp.* to netdrv_udp.c to fit naming convention; Small menu ui fixes
 
 20080126
 --------
diff --git a/SConstruct b/SConstruct
index b1880fa52..2e5c85d79 100644
--- a/SConstruct
+++ b/SConstruct
@@ -124,6 +124,7 @@ common_sources = [
 'main/multibot.c',
 'main/multipow.c',
 'main/netdrv.c',
+'main/netdrv_udp.c',
 'main/netlist.c',
 'main/netpkt.c',
 'main/network.c',
@@ -148,7 +149,6 @@ common_sources = [
 'main/texmerge.c',
 'main/text.c',
 'main/titles.c',
-'main/udp.c',
 'main/vclip.c',
 'main/wall.c',
 'main/weapon.c',
diff --git a/main/udp.c b/main/netdrv_udp.c
similarity index 99%
rename from main/udp.c
rename to main/netdrv_udp.c
index 40039ee48..4ba709e3f 100755
--- a/main/udp.c
+++ b/main/netdrv_udp.c
@@ -25,7 +25,7 @@
 #include "netdrv.h"
 #include "network.h"
 #include "timer.h"
-#include "udp.h"
+#include "netdrv_udp.h"
 #include "key.h"
 #include "text.h"
 
diff --git a/main/udp.h b/main/netdrv_udp.h
similarity index 100%
rename from main/udp.h
rename to main/netdrv_udp.h
diff --git a/main/newmenu.c b/main/newmenu.c
index 8899b3629..8e1ef64d2 100644
--- a/main/newmenu.c
+++ b/main/newmenu.c
@@ -81,7 +81,7 @@ grs_bitmap nm_background1;
 
 #define MAXDISPLAYABLEITEMS 15
 #define MESSAGEBOX_TEXT_SIZE 2176		// How many characters in messagebox (changed form 300 (fixes crash from show_game_score and friends) - 2000/01/18 Matt Mueller)
-#define MAX_TEXT_WIDTH 	FONTSCALE_X((GameArg.GfxUseHiresFont)?240:120)	// How many pixels wide a input box can be
+#define MAX_TEXT_WIDTH 	FONTSCALE_X((GameArg.GfxUseHiresFont && SWIDTH>=640 && SHEIGHT>=480)?240:120)	// How many pixels wide a input box can be
 
 // ZICO - since the background is rescaled the bevels do the same. because of this we need bigger borders or the fonts would be printed inside the bevels...
 #define MENSCALE_X ((double)(SWIDTH/320))