Improve: menu bar, with UI
Merge branch 'dev_peace' into dev_joe