Using the menu from yaml.
Tweaking the menu
Fixing the submenu.