Fix layout structure