Remove an extra onclick bind
Merge branch 'master' into templates
Add extra spaces between templates
Refactor a couple templates