Fixes form add prompt to be more comprehensive, easier to work with, Fixes #567 #541