Fix remaining layout issues