Sort Feature
Style fix
Sorting
Changes
Merge branch 'TypeCMS'
Merge remote-tracking branch 'origin/Sorter'