Changed to thinner borders for categories
Resolved merge conflicts and concluded merge