Added menus
Fixed merge conflicts