Check in of code clean up for navigation across different pages