UI and logic improvement (select files)