change internal position of elements immediately; deleting old controls from source
Merge branch 'dev'