Restructured main menu to be cleaner