Updated Navigation Script