Working on gross layout issues