Verification Tools: Remodel Form

This may also fixes #1196.