Fix new layout