Improved router functionality. Added categories and subcategories to routes