Further UI improvements
Add enter for selecting