Navigation Fixes

Took a while dontcha think?