Don't rebuild form after adding plugin specific options
Minor code clean-up
Minor code clean-up