new menu changes

many code changes because of the new menu