Refactored file navigation