fixes #1857 fixes #1858 reorder top menubar