[origin-ui-180] Several code improvements