Move Categories Navigation out of the core