Menu refactor

We have a real menu now :] It needs images still, but I will do those when I get to a desktop computer