[Refactor/Fix] Navigation handling