diff --git a/src/navigation/DrawerNavigator.tsx b/src/navigation/DrawerNavigator.tsx
index d1cde85..12f8d2f 100644
--- a/src/navigation/DrawerNavigator.tsx
+++ b/src/navigation/DrawerNavigator.tsx
@@ -78,14 +78,14 @@ const DrawerNavigator = () => {
       <Drawer.Screen name="ChangePassword" component={ChangePassword} />
       <Drawer.Screen name="School" component={SchoolView} />
       <Drawer.Screen name="SchoolUpdate" component={SchoolUpdate} />
-      <Drawer.Screen name="Class" component={ClassStackNavigator} />
+      <Drawer.Screen name="Class" component={ClassView} />
       <Drawer.Screen name="TeacherAttendance" component={TeacherAttendance} />
       <Drawer.Screen name="Pscyometric" component={StudentListPsychometric} />
-      {/* <Drawer.Screen name="ClassCreate" component={ClassCreate} /> */}
-      {/* <Drawer.Screen name="ClassUpdate" component={ClasslUpdate} /> */}
-      <Drawer.Screen name="TeacherView" component={TeeacherStackNavigator} />
-      {/* <Drawer.Screen name="TeacherCreate" component={TeacherCreate} />
-      <Drawer.Screen name="TeacherUpdate" component={TeacherUpdate} /> */}
+      <Drawer.Screen name="ClassCreate" component={ClassCreate} />
+      <Drawer.Screen name="ClassUpdate" component={ClasslUpdate} />
+      <Drawer.Screen name="TeacherView" component={TeacherView} />
+      <Drawer.Screen name="TeacherCreate" component={TeacherCreate} />
+      <Drawer.Screen name="TeacherUpdate" component={TeacherUpdate} />
       <Drawer.Screen name="TeacherInfo" component={TeacherInfo} />
     </Drawer.Navigator>
   );
diff --git a/src/screens/Home.tsx b/src/screens/Home.tsx
index ffb70df..4108109 100644
--- a/src/screens/Home.tsx
+++ b/src/screens/Home.tsx
@@ -173,7 +173,7 @@ class Home extends React.Component<any, any> {
     const classDataInfo: any = JSON.parse(JSON.stringify(classData))
 
     classDataInfo['academic_year'] = this.state.academicYear.toString()
-    classDataInfo['name'] = moment().format('MMMM Do YYYY, h:mm:ss a').toString()
+    classDataInfo['name'] = moment().format('MMMM Do YYYY, h:mm:ss A').toString()
     classDataInfo['topics'] = "Feedback"
     if (studentList.data) {
       if (studentList.data.length) {
diff --git a/src/screens/InstantFeedback/InstantFeedbackCreate.tsx b/src/screens/InstantFeedback/InstantFeedbackCreate.tsx
index 7ce9445..f15cf93 100644
--- a/src/screens/InstantFeedback/InstantFeedbackCreate.tsx
+++ b/src/screens/InstantFeedback/InstantFeedbackCreate.tsx
@@ -128,7 +128,7 @@ class InstantFeedbackCreate extends React.Component<any, any>{
   }
 
   render() {
-    const defaultFeedbackName: any = moment().format('MMMM Do YYYY, h:mm:ss a').toString()
+    const defaultFeedbackName: any = moment().format('MMMM Do YYYY, h:mm:ss A').toString()
 
     return (<View style={[AppStyles.containerWoPadding, {}]}>
 
diff --git a/src/screens/Teacher/TeacherCreate.tsx b/src/screens/Teacher/TeacherCreate.tsx
index 17866ef..5eacdc4 100644
--- a/src/screens/Teacher/TeacherCreate.tsx
+++ b/src/screens/Teacher/TeacherCreate.tsx
@@ -60,7 +60,7 @@ class TeacherCreate extends React.Component<any, any>{
   componentDidUpdate() {
     if (this.props.data.hasOwnProperty('status')) {
       if (this.props.data.status) {
-        this.props.navigation.navigate('Teacher')
+        this.props.navigation.navigate('TeacherView')
       } else {
         /** Formik Errors on submit */
         if (this.formikActions) {          
@@ -75,7 +75,7 @@ class TeacherCreate extends React.Component<any, any>{
   }
 
   onCancel = () => {
-    this.props.navigation.navigate("Teacher")
+    this.props.navigation.navigate("TeacherView")
   }
 
   onTeacherSubmit = (data: any, actions: any) => {
diff --git a/src/screens/Teacher/TeacherUpdate.tsx b/src/screens/Teacher/TeacherUpdate.tsx
index 2c1f5a0..5bfb913 100644
--- a/src/screens/Teacher/TeacherUpdate.tsx
+++ b/src/screens/Teacher/TeacherUpdate.tsx
@@ -58,7 +58,7 @@ class TeacherUpdate extends React.Component<any, any>{
         getTeacherDetail({ teacher_id: route.params.teacher_id, token: this.token })
         this.props.initTeacher()    
       } else {
-        navigation.navigate("Teacher")
+        navigation.navigate("TeacherView")
       }      
     } else {
       navigation.navigate('signin')
@@ -68,7 +68,7 @@ class TeacherUpdate extends React.Component<any, any>{
   componentDidUpdate() {    
     if (this.props.data.hasOwnProperty('status')) {
       if (this.props.data.status) {
-        this.props.navigation.navigate('Teacher')
+        this.props.navigation.navigate('TeacherView')
       } else {
         /** Formik Errors on submit */
         if (this.formikActions) {
@@ -83,7 +83,7 @@ class TeacherUpdate extends React.Component<any, any>{
   }
 
   onCancel = () => {
-    this.props.navigation.navigate("Teacher")
+    this.props.navigation.navigate("TeacherView")
   }
 
   onTeacherUpdate = (data: any, actions: any) => {
@@ -113,7 +113,7 @@ class TeacherUpdate extends React.Component<any, any>{
       if (this.props.info.status) {        
         firstname = this.props.route.params.data.firstname
         lastname = this.props.route.params.data.lastname
-        gender= this.props.route.params.data.gender,
+        gender= this.props.info.data.gender,
         phoneNumber = this.props.route.params.data.phone_number
         emailId = this.props.route.params.data.email_id
         imageInput = this.props.route.params.data.image,
diff --git a/src/screens/class/classCreate.tsx b/src/screens/class/classCreate.tsx
index 5d338ef..d90c68a 100644
--- a/src/screens/class/classCreate.tsx
+++ b/src/screens/class/classCreate.tsx
@@ -46,7 +46,7 @@ class ClassCreate extends React.Component<any, any>{
   componentDidUpdate() {
     if (this.props.data.hasOwnProperty('status')) {
       if (this.props.data.status) {
-        this.props.navigation.navigate('ClassView')
+        this.props.navigation.navigate('Class')
       } else {        
         /** Formik Errors on submit */
         if(this.formikActions){          
@@ -61,7 +61,7 @@ class ClassCreate extends React.Component<any, any>{
   }
 
   onCancel = () => {
-    this.props.navigation.navigate("ClassView")
+    this.props.navigation.navigate("Class")
   }
 
   onSelectChange = (event: any, action: any, setFieldValue: any) => {
diff --git a/src/screens/class/classUpdate.tsx b/src/screens/class/classUpdate.tsx
index 962bb0b..e24f811 100644
--- a/src/screens/class/classUpdate.tsx
+++ b/src/screens/class/classUpdate.tsx
@@ -49,7 +49,7 @@ class ClasslUpdate extends React.Component<any, any>{
   componentDidUpdate() {    
     if (this.props.data.hasOwnProperty('status')) {
       if (this.props.data.status) {
-        this.props.navigation.navigate('ClassView')
+        this.props.navigation.navigate('Class')
       } else {
         /** Formik Errors on submit */
         if (this.formikActions) {
@@ -64,7 +64,7 @@ class ClasslUpdate extends React.Component<any, any>{
   }
 
   onCancel = () => {
-    this.props.navigation.navigate("ClassView")
+    this.props.navigation.navigate("Class")
   }
 
   onSelectChange = (event: any, action: any, setFieldValue: any) => {