Improved UI, added folder selection