in process of changing to individual layouts