Auto-layout improvements