update to layout-07 as per final implementation