Menu-stuff

I touched a bit of everything.... this may be messy.
Merge pull request #15 from Lonely-Toaster/Menu-Systems

Menu-stuff