simplified the layouts