Change the way we insert our custom service into Jetpack

And split the button into its own file
Update to 1.2