adjustments for ui branch changes