Make improved download folder selection look good and refactor it