CON-1016 | Minor design fixes