Button list revert
Revert "Button list revert"

This reverts commit a40b3c23c0e09bf9e43b62f2c76ec26bf58d3095.