forms updated - classes and twigs were improved