UI in a file

Improved the selection process