Started reworking the menu