Reorder Sidebar Menu entries and smaller fixes #353

Open
simon wants to merge 7 commits from feature/reorder-sidebar-menu into main

7 commits