Auto-layout now works as it should