Fixed up templates a bit