Added loading indicator, implemented dir select