some little fixes with classes and form