#520 Minor improvements
Disabled buttons shouldn't be visible 100%