show/hide/style category stuff appropriately
fix merge conflicts