Added folder browser, optimised populate code