Reorder some things in default template.