Changes done for navigation