Minor template tweaks
Merge changes to main template with additional stylings that weren't
committed on Friday.

Conflicts:
	app/views/main.scala.html
Template tidyup/cosmetic fixes