Navigation updates

Still not 100% happy