Clean up folder navigation