Continued dev on the main menu and core app structure