Still tackling the select to button list bug involving a context problem
Corrected select to button bug.