UI modified
Merge pull request #47 from SupunS/master

UI modified