webui code sync
Merge pull request #172 from Ankitja/R1.06

 webui code sync