Better file upload naming and menu handling