#1078 - clean up Admin Presentation friendly names and ordering