Fix bug with change dir by drop down navigation & improve readability