Started refactor of the menu bar