Make categories naming consistent
Adjust header sizes and position