Changed general layouts