Change index to new layout