Merge pull request #4 from tharindu1st/master

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

please pull