Category adjustments
Borders with some changes