foundation for switch to new UI
Merge branch 'ui_move'