Button locking, among other things.
Merge remote-tracking branch 'origin/UI-Tweaking'