Redefine menu

The design of the menu was updated, and this reflects the new logic behind
the menu.
?