Merge pull request #6 from ianphs/ui2

Ui2 refactoring, recent added requirements