Bug fix
Formatting
Fixed bug with group/category order