toolbar branch
UI changes, not all are fully implemented
Merge branch 'toolbar_branch'