UI model building steps modifed
Merge pull request #60 from SupunS/master

UI model building steps modifed