Merge "refactor so-mon-ui code"