Styling and category fixes