Adding a UI to add specifc fields to the bundle.
Minor fixes.