Change icons. Update dot points. Some refactoring.
Merge remote-tracking branch 'origin/master'

Conflicts:
	script.coffee
	script.js