Clean up the new Button code a bit