bugfixing buttons