Added Navigation throughout the app - JP