more progress on UI integration