[origin-ui-180] Bug fixes and improvements according to code review