DC/Ajay| #3244 | fixing ui bugs