Fixing the menu and stuff