CSS cleanup and new switch for displaying categories