Reorganise the menu structure/system

I feel like we need to go over the menu/navigation tree.