reworked the way the menu is build