Fix the layouts again