Merge pull request #45 from SupunS/master

UI improvements
fixed escape characters
Merge pull request #46 from lochana/master

fixed escape characters