Several changes made on forms