Fixed some forms (Initial)