Changed the menu system so it's not so bassakwards
Merging 2 branches