ZING-1635: Implemented eds review comments
ZING-1635: Implemented eds review comments

control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced