Create toolbar and move diagnostics button into it
This is a continuation of work done by @buoyantair-guest in !1629 (closed) and fixes several existing issues and issues with the merge request. @buoyantair-guest please take a look at my changes and see if anything else needs to be done. Also this could use another round of thorough testing.
Edited by Sunil Mohan Adapa