Cleanup.
Adding the new buttons.