[DF-278] tweaks for UI