Upgraded categories navigation