Many small changes to default template