Fixed the Form fields