Always list name before slug so that they appear in correct order in admin.

Slug is often autopopulated by the entry in the name field so it makes sense to fill in the name field first.

Closes #1097