Revert "Improved buttons"

This reverts commit 3b94de50cf0f8dcdfa75d546b1ed081225b50cbb.