Fixed a few bugs and added a temp main menu