Display of buttons based on selection
Merged master and mine