initial layout improvements + initial migration