Made some updates to the default template