Fix a random bug and clean start menu