fixed the layouts