Ui2 refactoring, recent added requirements

refactoring, recent added requirements