modification to navigation etc