Initial template edits