Feature/simpler wastage form closes item:382