Some in-progress changes on "map toolbar"
WIP: menu re-arranging.