Fixed disarranged categories

Closes #1033