Made some formatting edits in templates