Interim checkin: axis switching UI sort of working
Add attribute to enable/disable axis switching UI
Slightly change axis switch UI element