new layout support small set of fixes