Huge commit.
Merge branch 'delon-ui' into feature/junhao-v0.4-changes
highlight up on control side