Add layout fields
Improve FormForForm