Changing toolbar from navbar to button toolbar.
Finished toolbar rework
Merge branch 'new-toolbar' into develop