Added new template, adjusted view/model