Fix broken button
Merge branch 'fix-button'