Fix layout to new design, images