Added in some more classes, fixed the mainmenu