Moved Map, working on post login menus