Updated a lot of stuff, menu now works