Tidy up field orders, enable pathauto
Resolve conflict