implemented new layout