Improved UI and pin selection