Fix the layouts