majority of layout changes to match comps