Create layout

BenP asked me to merge this into master.