Merge pull request #37 from niravpatel2008/nirav

Nirav
mitesh add new icons and fix some bugs
solve some ui issue and code issue :mitesh
Merge pull request #38 from niravpatel2008/mitesh

Mitesh
Js change