angelo/bugfix/buttons-sometimes-disappear