Add ability to highlight selected category
Add pagination