Updated Navigation controller