[chore] Update directives as per UI review