Form improvement
Form lookup fix
New form viewer working