[origin-ui-192] Adjustments according to feedback