bunch of fixes for inspection Form