Improvements to program selector

Just wanted to make this work as I expect before I fix its visual
design.