Fix initial layout