Refined form navigation, added file code and serial number fields