CF custom order | added groups...

...and removed some unnecessary sorting.