Fixed menu and include paths