refactor menu structure and add new menu