Refs #20087; Started updating normal view and embedded view