start moving to new layout style