added fixes on forms