Add missing models
Minor form tweaks