Bugfixing: Buttons work and report