Merge "Fill UI polish" into oc-dev