Added initial layout (with @ChrisBeaumont and @keflavich)