Add back selection button for Visitor Mode
Add additional UI control for Visitor Mode
Merge branch 'master' into nahush
..