Rework using class_form
Finish using forms for cans - fix #1