BZ-1048230: initial layout fix