Menu-bar 1
Restore and refactore the menu bar from first version