Merge pull request #23 from Dilshani/master

patch 09
upgrade UI
upgrade UI
merge dilshani
merge dilshani
merge dilshani
patch 12