Folder browsing + minor tweaks