Updated layouts per KSR meeting 9/4