new layout before fix errors