diff --git a/src/app/district-mapping/district-mapping.page.html b/src/app/district-mapping/district-mapping.page.html
index bfe4e105ad..c0f9f95907 100644
--- a/src/app/district-mapping/district-mapping.page.html
+++ b/src/app/district-mapping/district-mapping.page.html
@@ -48,7 +48,7 @@
 <div class="footer" *ngIf="platform.is('android')">
   <div class="btn-info" *ngIf="locationFormConfig && locationFormConfig.length">
     <button class="block-button-clear"
-            [ngClass]="{'blur-clear-btn': formGroup?.invalid}" [disabled]="formGroup?.invalid"
+            [ngClass]="{'blur-clear-btn': formGroup?.invalid || hideClearButton}" [disabled]="formGroup?.invalid || hideClearButton"
             (click)="clearUserLocationSelections()">{{'CLEAR' | translate}}
     </button>
     <button class="block-button-save"
diff --git a/src/app/district-mapping/district-mapping.page.ts b/src/app/district-mapping/district-mapping.page.ts
index ddedbe4204..04ba39d721 100644
--- a/src/app/district-mapping/district-mapping.page.ts
+++ b/src/app/district-mapping/district-mapping.page.ts
@@ -51,6 +51,7 @@ export class DistrictMappingPage implements OnDestroy {
   formGroup?: FormGroup;
   showNotNowFlag = false;
   locationFormConfig: FieldConfig<any>[] = [];
+  hideClearButton : boolean = false;
   profile?: Profile;
   navigateToCourse = 0;
   isGoogleSignIn = false;
@@ -503,6 +504,7 @@ export class DistrictMappingPage implements OnDestroy {
     }
     this.initialFormLoad = false;
     this.locationFormConfig = locationMappingConfig;
+    this.hideClearButton = false;
      if(this.params){
     this.fieldConfig();
   }
@@ -715,6 +717,7 @@ export class DistrictMappingPage implements OnDestroy {
             element.children[key].forEach(childEl => {
               childEl.templateOptions.hidden =true;
               childEl.templateOptions.disabled =true;
+              this.hideClearButton = true;
              });
           });
         }
diff --git a/src/app/manage-learn/core/services/project.service.ts b/src/app/manage-learn/core/services/project.service.ts
index d693cba78d..aad82b9990 100644
--- a/src/app/manage-learn/core/services/project.service.ts
+++ b/src/app/manage-learn/core/services/project.service.ts
@@ -123,6 +123,7 @@ export class ProjectService {
         replaceUrl: replaceUrl
       }
       this.db.create(success.result).then(successData => {
+        this.createNewProject(success.result, false)
         this.navigateToProjectDetails(navObj);
       }).catch(error => {
         if (error.status === 409) {
diff --git a/src/app/manage-learn/project/add-file/add-file.page.ts b/src/app/manage-learn/project/add-file/add-file.page.ts
index f47e7cb40d..cc695dcb78 100644
--- a/src/app/manage-learn/project/add-file/add-file.page.ts
+++ b/src/app/manage-learn/project/add-file/add-file.page.ts
@@ -318,12 +318,6 @@ export class AddFilePage implements OnInit {
       // this.project.status = statusType.submitted;
       this.update('submit');
     }, 0)
-    this.router.navigate([`${RouterLinks.PROJECT}/${RouterLinks.DETAILS}`], {
-      queryParams: {
-        projectId: this.project._id,
-        programId: this.project.programId,
-        solutionId: this.project.solutionId,
-      }, replaceUrl: true
-    });
+    this.location.back()
   }
 }
diff --git a/src/app/manage-learn/project/project-templateview/project-templateview.page.ts b/src/app/manage-learn/project/project-templateview/project-templateview.page.ts
index a11dd70b35..2de1a5eaad 100644
--- a/src/app/manage-learn/project/project-templateview/project-templateview.page.ts
+++ b/src/app/manage-learn/project/project-templateview/project-templateview.page.ts
@@ -289,6 +289,7 @@ export class ProjectTemplateviewPage implements OnInit {
           projectId: this.project.projectId,
           programId: this.programId,
           solutionId: this.solutionId,
+          hasAcceptedTAndC: this.project.hasAcceptedTAndC,
         },
       });
     } else {