UI cleanup
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from preethamhegdes/master

UI cleanup