ui changes done
Merge pull request #3 from tharindu1st/master

Merge pull request #1 from madusankap/master
Merge pull request #2 from madusankap/master

please pull