Revert "Button panels updated"

This reverts commit bbc758c9baf5504170013a449a8c06bb16ab9aef.