Fix initial layouts