Fixing menus and other parts (Calvins Part)