* (DA++) Fixed not being applied in some cases
* Fixed some buttons don't get moved
Merge branch 'Dev'