Revert "Attempt to fix buttons disappearing"

This reverts commit 2c7636b0691ea7ef5d2a4c43ca66fee7a4903faa.
Revert "Revert "Attempt to fix buttons disappearing""

This reverts commit 50f62e1123d57eff2e68c446e98092d7a7f9c466.