Changed default template a bit