UI is drawn based on what has, and has not been selected.
UI is drawn is based on what has and has not been selected
Merge remote-tracking branch 'origin/master'