UI modified
Merge pull request #43 from SupunS/master

UI modified