Changed order of constaints to control the columns shown in the scaffolded admin screens.