Adding navigation helper code