Finalizing navigation code