refactor
Improved main menu