BVAL-473 Integrating TCK information and reorganizing navigation