Remove address form from some unlikely presets
Add source form label
Remove inline forms

No good way to give them IDs; better to be consistent.