Updating button to use new architecture