[DF-278] final UI tweaks