Feature/merge menus/329