UI framework refinement

UI framework refinement