Completing Auto-layout improvements.