Btw,

I've pushed some changes to provide a better control over the buttons. You'll notice the add/remove buttons are enabled/disable depending on the entries of tables or even if some pre-requisite does not exists.

Regards.