Changed templates up a bit