Refactored navigation a bit.