Hide some UI elements we don't want to show etc
Fix bugs releated to form data type/structure