Merge pull request #6 from tharindu1st/master

please pull
ui changes done
Merge pull request #5 from madusankap/master

please pull