Small changes to the button module