diff --git a/src/app/components/admin-app/admin-app-template-search/admin-template-details/admin-template-details.component.html b/src/app/components/admin-app/admin-app-template-search/admin-template-details/admin-template-details.component.html
index 8821dbd6..d8f5ceed 100644
--- a/src/app/components/admin-app/admin-app-template-search/admin-template-details/admin-template-details.component.html
+++ b/src/app/components/admin-app/admin-app-template-search/admin-template-details/admin-template-details.component.html
@@ -5,9 +5,9 @@
 
 <div class="d-flex flex-column">
   <mat-form-field>
+    <mat-label>Name</mat-label>
     <input
       matInput
-      placeholder="Name"
       tabIndex="1"
       name="name"
       [(ngModel)]="appTemplate.name"
@@ -15,9 +15,9 @@
     />
   </mat-form-field>
   <mat-form-field>
+    <mat-label>URL</mat-label>
     <input
       matInput
-      placeholder="Url"
       tabIndex="2"
       name="url"
       [(ngModel)]="appTemplate.url"
@@ -25,9 +25,9 @@
     />
   </mat-form-field>
   <mat-form-field>
+    <mat-label>Icon Path</mat-label>
     <input
       matInput
-      placeholder="icon"
       tabIndex="3"
       name="icon"
       [(ngModel)]="appTemplate.icon"
diff --git a/src/app/components/admin-app/admin-view-search/admin-view-edit/admin-view-edit.component.html b/src/app/components/admin-app/admin-view-search/admin-view-edit/admin-view-edit.component.html
index 462ff364..e48391f2 100644
--- a/src/app/components/admin-app/admin-view-search/admin-view-edit/admin-view-edit.component.html
+++ b/src/app/components/admin-app/admin-view-search/admin-view-edit/admin-view-edit.component.html
@@ -76,8 +76,8 @@ <h4 class="header-text ms-2">Edit View: {{ view.name }}</h4>
             <div class="add-margin">
               <div>
                 <mat-form-field>
+                  <mat-label>Status</mat-label>
                   <mat-select
-                    placeholder="Status"
                     [(ngModel)]="view.status"
                     name="viewStatus"
                     (selectionChange)="saveViewStatus()"
@@ -129,7 +129,7 @@ <h4 class="header-text ms-2">Edit View: {{ view.name }}</h4>
               </button>
             </mat-menu>
             <mat-menu #viewAppTemplates="matMenu">
-              @for (t of applicationTemplates; track t) {
+              @for (t of applicationTemplates; track t.id) {
                 <button mat-menu-item (click)="addViewApplication(t)">
                   {{ t.name }}
                 </button>
@@ -157,7 +157,7 @@ <h4 class="header-text ms-2">Edit View: {{ view.name }}</h4>
                   Add New Team
                 </button>
               </div>
-              @for (teamContainer of teams; track teamContainer) {
+              @for (teamContainer of teams; track teamContainer.team.id) {
                 <mat-expansion-panel
                   [expanded]="
                     currentTeam !== undefined &&
@@ -168,6 +168,9 @@ <h4 class="header-text ms-2">Edit View: {{ view.name }}</h4>
                   <mat-expansion-panel-header>
                     <mat-panel-title>
                       {{ teamContainer.name }}
+                      @if (view.defaultTeamId === teamContainer.team.id) {
+                        <span class="default-badge">DEFAULT</span>
+                      }
                     </mat-panel-title>
                   </mat-expansion-panel-header>
                   <div class="d-flex">
@@ -190,11 +193,11 @@ <h4 class="header-text ms-2">Edit View: {{ view.name }}</h4>
                           </span>
                         </div>
                         <mat-form-field>
+                          <mat-label>Team Name (required)</mat-label>
                           <input
                             id="teamName{{ teamContainer.team.id }}"
                             matInput
                             [formControl]="teamNameFormControl"
-                            placeholder="Team Name"
                             (change)="
                               saveTeamName(
                                 $event.target.value,
@@ -287,73 +290,85 @@ <h4 class="header-text ms-2">Edit View: {{ view.name }}</h4>
         </mat-step>
         <mat-step label="Files">
           <mat-accordion>
-            <div>
-              <input
-                hidden
-                (change)="selectFile($event.target.files)"
-                #fileInput
-                type="file"
-              />
-              <div>
-                @if (staged.length === 0) {
-                  <div class="top-button d-flex justify-content-end">
-                    <button mat-stroked-button (click)="fileInput.click()">
-                      Add New File
-                    </button>
-                  </div>
-                }
-                @if (staged.length !== 0) {
-                  <div
-                    class="top-button d-flex justify-content-end align-items-center"
-                  >
-                    <mat-list>
-                      @for (playerFile of staged; track playerFile) {
-                        <mat-list-item>
-                          {{ playerFile.file.name }}
-                          <div>
-                            <button
-                              mat-icon-button
-                              (click)="removeFile(playerFile)"
-                            >
-                              <mat-icon
-                                style="transform: scale(0.85)"
-                                svgIcon="ic_clear_black_24px"
-                              ></mat-icon>
-                            </button>
-                          </div>
-                        </mat-list-item>
-                      }
-                    </mat-list>
-                    <div>
-                      <mat-form-field id="teamSelect">
-                        <mat-label>Select Teams</mat-label>
-                        <mat-select multiple [(ngModel)]="teamsForFile">
-                          @for (teamWrapper of teams; track teamWrapper) {
+            <input
+              hidden
+              (change)="selectFile($event.target.files)"
+              #fileInput
+              type="file"
+            />
+            <div class="top-button d-flex justify-content-end">
+              <button mat-stroked-button (click)="fileInput.click()">
+                Add New File
+              </button>
+            </div>
+            @if (staged.length !== 0) {
+              <mat-expansion-panel [expanded]="true">
+                <mat-expansion-panel-header>
+                  <mat-panel-title>
+                    <div class="d-flex align-items-center">
+                      <img
+                        height="25"
+                        src="assets/img/SP_Icon_Intel.png"
+                        alt="File"
+                      />{{ staged[0].file.name }}
+                    </div>
+                  </mat-panel-title>
+                </mat-expansion-panel-header>
+                <div>
+                  <div class="d-flex flex-column align-items-center">
+                    <div class="d-flex align-items-center">
+                      <mat-checkbox
+                        color="primary"
+                        [(ngModel)]="selectAllTeamsForFile"
+                        (change)="toggleAllTeamsForFile($event.checked)"
+                        class="me-3"
+                      >
+                        Select All Teams
+                      </mat-checkbox>
+                      <mat-form-field id="teamSelect" style="width: 600px">
+                        <mat-label>Teams with Access</mat-label>
+                        <mat-select multiple [(ngModel)]="teamsForFile" (selectionChange)="onTeamsForFileChange()">
+                          @for (teamWrapper of teams; track teamWrapper.team.id) {
                             <mat-option [value]="teamWrapper.team.id">{{
                               teamWrapper.team.name
                             }}</mat-option>
                           }
                         </mat-select>
                       </mat-form-field>
-                      <button
-                        mat-stroked-button
-                        (click)="uploadFile()"
-                        style="height: 35px"
-                      >
-                        Upload File
-                      </button>
-                      @if (uploading) {
-                        <mat-progress-bar
-                          mode="determinate"
-                          [value]="uploadProgess"
-                        ></mat-progress-bar>
-                      }
                     </div>
+                    @if (teamsForFile.length === 0) {
+                      <div class="team-warning">
+                        At least one team must be selected
+                      </div>
+                    }
                   </div>
-                }
-              </div>
-            </div>
-            @for (viewFile of viewFiles; track viewFile) {
+                  @if (uploading) {
+                    <mat-progress-bar
+                      mode="determinate"
+                      [value]="uploadProgess"
+                      class="mb-3"
+                    ></mat-progress-bar>
+                  }
+                  <div class="delete-button d-flex justify-content-end">
+                    <button
+                      mat-stroked-button
+                      (click)="removeFile(staged[0])"
+                    >
+                      Cancel
+                    </button>
+                    <button
+                      mat-stroked-button
+                      (click)="uploadFile()"
+                      [disabled]="teamsForFile.length === 0"
+                      class="ms-2"
+                    >
+                      Upload File
+                    </button>
+                  </div>
+                </div>
+              </mat-expansion-panel>
+            }
+            @for (viewFile of viewFiles; track viewFile.id) {
               <mat-expansion-panel
                 [expanded]="
                   currentFile !== undefined && viewFile.id === currentFile.id
@@ -372,23 +387,38 @@ <h4 class="header-text ms-2">Edit View: {{ view.name }}</h4>
                   </mat-panel-title>
                 </mat-expansion-panel-header>
                 <div>
-                  <div class="d-flex justify-content-around">
-                    <mat-form-field id="teamSelect" style="width: 600px">
-                      <mat-label>Teams with Permission to View</mat-label>
-                      <mat-select
-                        multiple
-                        [ngModel]="viewFile.teamIds"
-                        (selectionChange)="
-                          teamsForFileUpdated($event, viewFile)
-                        "
+                  <div class="d-flex flex-column align-items-center">
+                    <div class="d-flex align-items-center">
+                      <mat-checkbox
+                        color="primary"
+                        [checked]="isAllTeamsSelected(viewFile)"
+                        (change)="toggleAllTeamsForViewFile($event.checked, viewFile)"
+                        class="me-3"
                       >
-                        @for (teamWrapper of teams; track teamWrapper) {
-                          <mat-option [value]="teamWrapper.team.id">{{
-                            teamWrapper.team.name
-                          }}</mat-option>
-                        }
-                      </mat-select>
-                    </mat-form-field>
+                        Select All Teams
+                      </mat-checkbox>
+                      <mat-form-field id="teamSelect" style="width: 600px">
+                        <mat-label>Teams with Access</mat-label>
+                        <mat-select
+                          multiple
+                          [ngModel]="viewFile.teamIds"
+                          (selectionChange)="
+                            teamsForFileUpdated($event, viewFile)
+                          "
+                        >
+                          @for (teamWrapper of teams; track teamWrapper.team.id) {
+                            <mat-option [value]="teamWrapper.team.id">{{
+                              teamWrapper.team.name
+                            }}</mat-option>
+                          }
+                        </mat-select>
+                      </mat-form-field>
+                    </div>
+                    @if (viewFile.teamIds && viewFile.teamIds.length === 0) {
+                      <div class="team-warning">
+                        At least one team must be selected
+                      </div>
+                    }
                   </div>
                   <div class="d-flex justify-content-around">
                     <button
diff --git a/src/app/components/admin-app/admin-view-search/admin-view-edit/admin-view-edit.component.scss b/src/app/components/admin-app/admin-view-search/admin-view-edit/admin-view-edit.component.scss
index 81bab6fa..25841d4e 100644
--- a/src/app/components/admin-app/admin-view-search/admin-view-edit/admin-view-edit.component.scss
+++ b/src/app/components/admin-app/admin-view-search/admin-view-edit/admin-view-edit.component.scss
@@ -70,3 +70,22 @@
 .view-info-container {
   margin-left: 20%;
 }
+
+.default-badge {
+  display: inline-block;
+  padding: 2px 8px;
+  margin-left: 8px;
+  font-size: 11px;
+  font-weight: 600;
+  text-transform: uppercase;
+  border-radius: 4px;
+  background-color: var(--mat-sys-primary-container);
+  color: var(--mat-sys-on-primary-container);
+}
+
+.team-warning {
+  color: var(--mat-sys-error);
+  font-size: 12px;
+  margin-top: 4px;
+  font-weight: 500;
+}
diff --git a/src/app/components/admin-app/admin-view-search/admin-view-edit/admin-view-edit.component.ts b/src/app/components/admin-app/admin-view-search/admin-view-edit/admin-view-edit.component.ts
index 612fe0f4..6216f250 100644
--- a/src/app/components/admin-app/admin-view-search/admin-view-edit/admin-view-edit.component.ts
+++ b/src/app/components/admin-app/admin-view-search/admin-view-edit/admin-view-edit.component.ts
@@ -95,6 +95,7 @@ export class AdminViewEditComponent implements OnInit {
 
   public staged: PlayerFile[];
   public teamsForFile: string[];
+  public selectAllTeamsForFile: boolean;
   public uploadProgess: number;
   public uploading: boolean;
   public viewFiles: FileModel[];
@@ -490,6 +491,30 @@ export class AdminViewEditComponent implements OnInit {
     this.staged = this.staged.filter((f) => f.file.name !== file.file.name);
   }
 
+  /**
+   * Toggles selection of all teams for file upload
+   *
+   * @param checked: Whether all teams should be selected
+   */
+  toggleAllTeamsForFile(checked: boolean) {
+    if (checked) {
+      this.teamsForFile = this.teams.map(t => t.team.id);
+    } else {
+      this.teamsForFile = [];
+    }
+  }
+
+  /**
+   * Handles manual changes to team selection
+   * Unchecks "Select All" if not all teams are selected
+   */
+  onTeamsForFileChange() {
+    const allTeamIds = this.teams.map(t => t.team.id);
+    const allSelected = allTeamIds.length === this.teamsForFile.length &&
+                        allTeamIds.every(id => this.teamsForFile.includes(id));
+    this.selectAllTeamsForFile = allSelected;
+  }
+
   /**
    * Returns a link to the download endpoint for a particular file
    */
@@ -649,11 +674,59 @@ export class AdminViewEditComponent implements OnInit {
    * @param file The file to update the teams for
    */
   teamsForFileUpdated(event: any, file: FileModel) {
-    file.teamIds = event.value;
+    const newTeamIds = event.value;
+
+    // Update local state to reflect selection
+    file.teamIds = newTeamIds || [];
+
+    // Only save to server if at least one team is selected
+    if (!newTeamIds || newTeamIds.length === 0) {
+      return;
+    }
+
     this.fileService
       .updateFile(file.id, file.name, file.teamIds, null)
       .pipe(take(1))
-      .subscribe();
+      .subscribe({
+        error: (err) => {
+          console.error('Error updating file teams:', err);
+        }
+      });
+  }
+
+  /**
+   * Checks if all teams are selected for a given file
+   * @param file The file to check
+   */
+  isAllTeamsSelected(file: FileModel): boolean {
+    if (!file.teamIds || !this.teams) {
+      return false;
+    }
+    const allTeamIds = this.teams.map(t => t.team.id);
+    return allTeamIds.length === file.teamIds.length &&
+           allTeamIds.every(id => file.teamIds.includes(id));
+  }
+
+  /**
+   * Toggles selection of all teams for a specific file
+   * @param checked Whether all teams should be selected
+   * @param file The file to update
+   */
+  toggleAllTeamsForViewFile(checked: boolean, file: FileModel) {
+    if (checked) {
+      file.teamIds = this.teams.map(t => t.team.id);
+      this.fileService
+        .updateFile(file.id, file.name, file.teamIds, null)
+        .pipe(take(1))
+        .subscribe({
+          error: (err) => {
+            console.error('Error updating file teams:', err);
+          }
+        });
+    } else {
+      // Allow clearing teams in UI, but don't save until at least one team is selected
+      file.teamIds = [];
+    }
   }
 
   /**
diff --git a/src/app/components/admin-app/view-applications-select/view-applications-select.component.html b/src/app/components/admin-app/view-applications-select/view-applications-select.component.html
index 147c3d44..64ae3235 100644
--- a/src/app/components/admin-app/view-applications-select/view-applications-select.component.html
+++ b/src/app/components/admin-app/view-applications-select/view-applications-select.component.html
@@ -15,7 +15,7 @@
 }
 
 <mat-accordion>
-  @for (app of applications; track app; let i = $index) {
+  @for (app of applications; track app.id; let i = $index) {
     <mat-expansion-panel
       [expanded]="currentApp !== undefined && app.id === currentApp.id"
       (opened)="currentApp = app"
@@ -36,48 +36,35 @@
         <div class="d-flex justify-content-center">
           <div class="d-flex flex-column app-form-section">
             <mat-form-field>
+              <mat-label>Application Name</mat-label>
               <input
                 matInput
-                placeholder="Application Name"
                 (change)="saveApplicationName($event.target.value, app.id)"
                 value="{{ app.name }}"
                 />
-              <!-- <mat-error *ngIf="nameFormControl.hasError('minlength') && !nameFormControl.hasError('required')">
-              Must contain 3 or more characters
-            </mat-error>
-            <mat-error *ngIf="nameFormControl.hasError('required')">
-              Name is <strong>required</strong>
-            </mat-error> -->
           </mat-form-field>
           <mat-form-field>
+            <mat-label>Application URL</mat-label>
             <input
               matInput
-              placeholder="Application Url"
               (change)="saveApplicationUrl($event.target.value, app.id)"
               value="{{ app.url }}"
               [errorStateMatcher]="matcher"
               />
-            <!-- <mat-error *ngIf="urlFormControl.hasError('required')">
-            Url is <strong>required</strong>
-          </mat-error> -->
         </mat-form-field>
         <mat-form-field>
+          <mat-label>Icon Path</mat-label>
           <input
             matInput
-            placeholder="Icon Path"
             (change)="saveApplicationIcon($event.target.value, app.id)"
             value="{{ app.icon }}"
             [errorStateMatcher]="matcher"
             />
-          <!-- <mat-error *ngIf="iconFormControl.hasError('required')">
-          Icon is <strong>required</strong>
-        </mat-error> -->
       </mat-form-field>
       <mat-form-field>
+        <mat-label>Embeddable</mat-label>
         <mat-select
-          placeholder="Embeddable"
           (selectionChange)="saveApplicationEmbeddable(app)"
-          [(value)]="selected"
           [(ngModel)]="app.embeddable"
           >
           <mat-option [value]="null">Inherit from Template</mat-option>
@@ -86,10 +73,9 @@
         </mat-select>
       </mat-form-field>
       <mat-form-field>
+        <mat-label>Load in Background</mat-label>
         <mat-select
-          placeholder="Load in Background"
           (selectionChange)="saveApplicationLoadInBackground(app)"
-          [(value)]="selected"
           [(ngModel)]="app.loadInBackground"
           >
           <mat-option [value]="null">Inherit from Template</mat-option>
@@ -98,14 +84,13 @@
         </mat-select>
       </mat-form-field>
       <mat-form-field>
+        <mat-label>Application Template</mat-label>
         <mat-select
-          placeholder="Application Template"
           (selectionChange)="saveApplicationTemplateId(app)"
-          [(value)]="selected"
           [(ngModel)]="app.applicationTemplateId"
           >
           <mat-option [value]="null">None</mat-option>
-          @for (template of applicationTemplates; track template) {
+          @for (template of applicationTemplates; track template.id) {
             <mat-option
               [value]="template.id"
               >
@@ -127,34 +112,33 @@
     <div class="d-flex w-100 justify-content-center">
       <div class="d-flex flex-column app-form-section">
         <mat-form-field>
+          <mat-label>Template Application Name</mat-label>
           <input
             matInput
             [disabled]="true"
-            placeholder="Application Name"
             value="{{ template.name }}"
             />
         </mat-form-field>
         <mat-form-field>
+          <mat-label>Template Application URL</mat-label>
           <input
             matInput
             [disabled]="true"
-            placeholder="Application Url"
             value="{{ template.url }}"
             />
         </mat-form-field>
         <mat-form-field>
+          <mat-label>Template Icon Path</mat-label>
           <input
             matInput
             [disabled]="true"
-            placeholder="Icon Path"
             value="{{ template.icon }}"
             />
         </mat-form-field>
         <mat-form-field>
+          <mat-label>Template Embeddable</mat-label>
           <mat-select
             [disabled]="true"
-            placeholder="Embeddable"
-            [(value)]="selected"
             [(ngModel)]="template.embeddable"
             >
             <mat-option [value]="null">Inherit from Template</mat-option>
@@ -163,10 +147,9 @@
           </mat-select>
         </mat-form-field>
         <mat-form-field>
+          <mat-label>Template Load in Background</mat-label>
           <mat-select
             [disabled]="true"
-            placeholder="Load in Background"
-            [(value)]="selected"
             [(ngModel)]="template.loadInBackground"
             >
             <mat-option [value]="null">Inherit from Template</mat-option>
diff --git a/src/app/components/admin-app/view-applications-select/view-applications-select.component.ts b/src/app/components/admin-app/view-applications-select/view-applications-select.component.ts
index 9e085800..2d774136 100644
--- a/src/app/components/admin-app/view-applications-select/view-applications-select.component.ts
+++ b/src/app/components/admin-app/view-applications-select/view-applications-select.component.ts
@@ -141,10 +141,7 @@ export class ViewApplicationsSelectComponent implements OnInit {
    * @param application The changed application object
    */
   saveApplicationEmbeddable(application: Application): void {
-    this.applicationService.getApplication(application.id).subscribe((app) => {
-      app.embeddable = application.embeddable;
-      this.saveApplication(app);
-    });
+    this.saveApplication(application);
   }
 
   /**
@@ -152,17 +149,11 @@ export class ViewApplicationsSelectComponent implements OnInit {
    * @param application The changed application object
    */
   saveApplicationLoadInBackground(application: Application): void {
-    this.applicationService.getApplication(application.id).subscribe((app) => {
-      app.loadInBackground = application.loadInBackground;
-      this.saveApplication(app);
-    });
+    this.saveApplication(application);
   }
 
   saveApplicationTemplateId(application: Application): void {
-    this.applicationService.getApplication(application.id).subscribe((app) => {
-      app.applicationTemplateId = application.applicationTemplateId;
-      this.saveApplication(app);
-    });
+    this.saveApplication(application);
   }
 
   /**
@@ -170,12 +161,8 @@ export class ViewApplicationsSelectComponent implements OnInit {
    */
   saveApplication(app: Application) {
     this.applicationService.updateApplication(app.id, app).subscribe(() => {
-      this.applicationService
-        .getViewApplications(this.view.id)
-        .subscribe((appInsts) => {
-          this.applications = appInsts;
-        });
-      console.log('Application name updated');
+      // Don't update local array - ngModel binding keeps it in sync
+      console.log('Application updated');
     });
   }
 
@@ -204,7 +191,7 @@ export class ViewApplicationsSelectComponent implements OnInit {
   getAppName(app: Application) {
     if (app.name != null) {
       return app.name;
-    } else if (app.applicationTemplateId != null) {
+    } else if (app.applicationTemplateId != null && this.applicationTemplates?.length > 0) {
       const template = this.applicationTemplates.find(
         (x) => x.id === app.applicationTemplateId
       );
@@ -212,17 +199,17 @@ export class ViewApplicationsSelectComponent implements OnInit {
       if (template != null) {
         return template.name;
       } else {
-        return null;
+        return 'Application';
       }
     } else {
-      return null;
+      return 'Application';
     }
   }
 
   getAppIcon(app: Application) {
     if (app.icon != null) {
       return app.icon;
-    } else if (app.applicationTemplateId != null) {
+    } else if (app.applicationTemplateId != null && this.applicationTemplates?.length > 0) {
       const template = this.applicationTemplates.find(
         (x) => x.id === app.applicationTemplateId
       );
@@ -230,10 +217,10 @@ export class ViewApplicationsSelectComponent implements OnInit {
       if (template != null) {
         return template.icon;
       } else {
-        return null;
+        return 'assets/img/SP_Icon_Dashboard.png';
       }
     } else {
-      return null;
+      return 'assets/img/SP_Icon_Dashboard.png';
     }
   }