changes done by dev 20 for navigation