Made changes to the layouts