Add some logic to categories and improve styling