enterprise ui refactoring