Fixed the layouts