Make the button more flexible