new layout + modifications