SWC-1959: Entity page top rerework