1)Syn UI changes from mainline
2)Infra changes
Merge pull request #188 from Ankitja/master

UI code changes