toolbar changes

added images, toolbar to index.html, etc.
Merge remote-tracking branch 'origin/Toolbars'

Conflicts:
	client/index.html