bugfixes - user changed to button