Started menu bar refactoring