Reworked the UI of the selection of the user