Fix broken buttons

Fixes #942