Updated to new APIs on a couple of the buttons
Revert "Updated to new APIs on a couple of the buttons"

This reverts commit 6349634bed981830a7f9e1693eca607a4f9718c5.
Updated to new 2.0 plugin format; clean-up