Fixes disabled categories style
Merge branch 'develop' into testing