Fix bad behaviour of lobby script
UI polish