Improving Auto-layout support.