Fixed case where it was producing false duplicate folders.

Some UI improvements