Resolve ambiguous layout issues