cleanup bugs and edit barcode
fixed form name conflict