Rework file picker