Fix up quick select
Improve display