General revisions for app-template.