Merge pull request #16 from tharindu1st/master

Merge pull request #6 from madusankap/master
Ui changes done
Merge remote-tracking branch 'origin/master'
Merge pull request #7 from madusankap/master

please pull