Removed duplicate navigation code