Wip/mschraal/toolbar cleanup
Touch-ups on Toolbar, to get an idea where it should be going.
This is not meant as a full rewrite, just a first step in the right direction.
Update May 19 2018
It got more into a full rewrite, although some bits and pieces need some later work.
Edited by Marinus Schraal