got menu's encapsulated, fixed outdated file paths