CLC-2887 Fixed design and feedback changes