modify towards new layout