Rework the button system
Remove the old Button class
Add new button class