partial work towards new layout
finished initial layouts