More for toolbar.
Merge remote-tracking branch 'origin/team1-initial-gui' into team1-initial-gui