Fixed the menu somewhat - still buggy