Update setup.html to be consistent w/ play.html
Update templates to match prototypes.