Merge advancedUI with Refactor