UI improvements on selection page