UI improvements for selection page