New layout

adding the layouts to the masterr branch to keep us from drifting too far.