Some refactoring and started coding for the Main Menu