Add some categories for pages and other improvements