Fix initial layout, part 2