Fixing categories display
TODO: Fix organisation