Apply removes from @updating
Reset variables when constraints were removed
Fix adaptive layout for real