DRYed up templates and updated layout