implemented new layout change