more gui changes
Merge branch 'master' of https://github.com/ADP-Hackathons/CommonConsumerDemo