UI fixes
Merge branch 'master' of https://github.com/KaustubhDeshmukh/Peer-CDS-intergrated