PLUS-1262 Two unnecessary boxes in Container pop-up