WIP. Added extra to button to allow it to be used for ButtonModal.  Enhanced Modal to allow a default button.