some refactoring in forms and their controller methods done, now it uses events