diff --git a/projects/gameboard-ui/src/app/admin/admin.module.ts b/projects/gameboard-ui/src/app/admin/admin.module.ts
index 635365db0..912dbcba3 100644
--- a/projects/gameboard-ui/src/app/admin/admin.module.ts
+++ b/projects/gameboard-ui/src/app/admin/admin.module.ts
@@ -34,7 +34,6 @@ import { ExternalGameAdminTeamContextMenuComponent } from './components/external
 import { ExternalGameAdminComponent } from './components/external-game-admin/external-game-admin.component';
 import { ExternalGameHostPickerComponent } from './components/external-game-host-picker/external-game-host-picker.component';
 import { ExternalHostEditorComponent } from './components/external-host-editor/external-host-editor.component';
-import { FeedbackEditorComponent } from './components/feedback-editor/feedback-editor.component';
 import { GameBonusesConfigComponent } from './components/game-bonuses-config/game-bonuses-config.component';
 import { GameCenterObserveComponent } from './components/game-center/game-center-observe/game-center-observe.component';
 import { GameCenterPracticePlayerDetailComponent } from './components/game-center/game-center-practice-player-detail/game-center-practice-player-detail.component';
@@ -141,7 +140,6 @@ import { UserPickerComponent } from '@/standalone/users/user-picker/user-picker.
     SiteOverviewStatsComponent,
     AdminOverviewComponent,
     SupportSettingsComponent,
-    FeedbackEditorComponent,
     ExtendTeamsModalComponent,
     ActiveTeamsModalComponent,
     AdminEnrollTeamModalComponent,
diff --git a/projects/gameboard-ui/src/app/admin/components/feedback-editor/feedback-editor.component.html b/projects/gameboard-ui/src/app/admin/components/feedback-editor/feedback-editor.component.html
deleted file mode 100644
index fa727cf1b..000000000
--- a/projects/gameboard-ui/src/app/admin/components/feedback-editor/feedback-editor.component.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="form-group pb-0 pt-1">
-    <label class="d-block" for="feedbackConfig-input">Feedback Questions</label>
-    <div class="my-2 p-1 badge badge-warning">DEPRECATED</div>
-    <textarea rows="11" type="text" class="form-control font-fixed-width" id="feedbackConfig-input"
-        name="feedbackConfig" [(ngModel)]="boundYaml" [placeholder]="sampleConfig" [readOnly]="true"
-        [disabled]="true"></textarea>
-
-    <div class="d-flex align-items-center mt-3">
-        <button *ngIf="feedbackConfig" type="button" class="btn btn-success ml-2 flex-basis-50"
-            [appCopyOnClick]="boundYaml">
-            Copy Deprecated Template to Clipboard
-        </button>
-    </div>
-</div>
diff --git a/projects/gameboard-ui/src/app/admin/components/feedback-editor/feedback-editor.component.ts b/projects/gameboard-ui/src/app/admin/components/feedback-editor/feedback-editor.component.ts
deleted file mode 100644
index 09513d9fa..000000000
--- a/projects/gameboard-ui/src/app/admin/components/feedback-editor/feedback-editor.component.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { BehaviorSubject, debounceTime, tap } from 'rxjs';
-import { FeedbackTemplate } from '@/api/feedback-models';
-import { UnsubscriberService } from '@/services/unsubscriber.service';
-import { ModalConfirmService } from '@/services/modal-confirm.service';
-
-@Component({
-  selector: 'app-feedback-editor',
-  templateUrl: './feedback-editor.component.html',
-  styleUrls: ['./feedback-editor.component.scss'],
-  providers: [UnsubscriberService]
-})
-export class FeedbackEditorComponent implements OnInit {
-  @Input() feedbackConfig = "";
-  @Output() templateChange = new EventEmitter<FeedbackTemplate | null>();
-
-  protected boundYaml = "";
-  protected sampleConfig?: string;
-  protected validationMessages: string[] = [];
-
-  private templateChangeSubject$ = new BehaviorSubject<FeedbackTemplate | null>(null);
-
-  public constructor(
-    private modalService: ModalConfirmService,
-    private unsub: UnsubscriberService) {
-    this.unsub.add(
-      this.templateChangeSubject$
-        .pipe(
-          debounceTime(1000),
-          tap(t => this.templateChange.emit(t))
-        )
-        .subscribe()
-    );
-  }
-
-  async ngOnInit() {
-    this.boundYaml = this.feedbackConfig;
-  }
-
-  protected handleAboutFeedbackClick() {
-    this.modalService.openConfirm({
-      bodyContent: `You can use this box to configure questions that will automatically be presented to players upon conclusion of a challenge or game. Enter valid YAML to set these up.
-
-Each question requires these properties at minumum:
-
-- **id:** A unique identifying string for the question.
-- **prompt:** The question that players will answer (e.g. "If you could change one thing about this challenge, what would it be?")
-- **type:** The type of the response you want to collect from players. Valid options are **likert**, **text**, **selectOne**, and **selectMany**.
-
-Depending on the value of **type**, additional configuration may be required. For non-text questions, you'll also need:
-
-- **min:** The minimum numeric value of the question's scale (e.g. 1 on a scale from 1-10)
-- **minLabel:** The label for the lowest value of the question's scale (e.g. "Very Easy")
-- **max:** The maximum numeric value of the question's scale (e.g. 10 on a scale from 10)
-- **maxLabel:** The label for the lowest value of the question's scale (e.g. "Very Hard")`,
-      hideCancel: true,
-      renderBodyAsMarkdown: true,
-      modalClasses: ["modal-xl"],
-      title: "About feedback templates"
-    });
-  }
-}
diff --git a/projects/gameboard-ui/src/app/admin/components/game-center/game-center-settings/game-center-settings.component.html b/projects/gameboard-ui/src/app/admin/components/game-center/game-center-settings/game-center-settings.component.html
index 7462a1fa3..5589c676b 100644
--- a/projects/gameboard-ui/src/app/admin/components/game-center/game-center-settings/game-center-settings.component.html
+++ b/projects/gameboard-ui/src/app/admin/components/game-center/game-center-settings/game-center-settings.component.html
@@ -154,9 +154,6 @@
                 <app-feedback-template-picker labelText="Challenges Feedback Template"
                     [(templateId)]="game.challengesFeedbackTemplateId"
                     (select)="handleChallengesFeedbackTemplateChanged($event)"></app-feedback-template-picker>
-
-                <app-feedback-editor *ngIf="game.feedbackConfig"
-                    [feedbackConfig]="game.feedbackConfig"></app-feedback-editor>
             </div>
 
             <div class="col-12 mt-5">
@@ -303,7 +300,7 @@ <h4>Execution</h4>
 
                 </div>
 
-                <div *ngIf="game.gameStart > game.gameEnd" class="row form-group">
+                <div *ngIf="game.gameEnd && game.gameStart > game.gameEnd" class="row form-group">
                     <alert type="warning" class="col-12">The game's open date must be less than its close date.</alert>
                 </div>
 
@@ -322,6 +319,18 @@ <h4>Execution</h4>
                     <small>total concurrent sessions allowed for game</small>
                 </div>
 
+                <div class="form-group pb-0 pt-1">
+                    <label for="sessionAvailabilityWarningThreshold-input">Session Availability Warning
+                        Threshold</label>
+                    <input type="number" class="form-control" id="sessionLimit-input"
+                        name="sessionAvailabilityWarningThreshold"
+                        [(ngModel)]="game.sessionAvailabilityWarningThreshold">
+                    <small>
+                        If set, shows a warning when the number of currently-available sessions drops below this
+                        number
+                    </small>
+                </div>
+
                 <div class="form-group pb-0 pt-1">
                     <label for="gamespaceLimit-input">Gamespace Limit</label>
                     <input type="number" class="form-control" id="gamespaceLimit-input" name="gamespaceLimit"
diff --git a/projects/gameboard-ui/src/app/admin/components/game-center/game-center-settings/game-center-settings.component.ts b/projects/gameboard-ui/src/app/admin/components/game-center/game-center-settings/game-center-settings.component.ts
index 24c2048ed..e7e51f939 100644
--- a/projects/gameboard-ui/src/app/admin/components/game-center/game-center-settings/game-center-settings.component.ts
+++ b/projects/gameboard-ui/src/app/admin/components/game-center/game-center-settings/game-center-settings.component.ts
@@ -2,13 +2,11 @@ import { KeyValue } from '@angular/common';
 import { AfterViewInit, Component, ViewChild } from '@angular/core';
 import { FormGroup, NgForm } from '@angular/forms';
 import { debounceTime, filter, firstValueFrom, switchMap, tap } from 'rxjs';
-import { FeedbackTemplate } from '@/api/feedback-models';
 import { ExternalGameHost, Game, GameEngineMode, GameRegistrationType } from '@/api/game-models';
 import { GameService } from '@/api/game.service';
 import { fa } from '@/services/font-awesome.service';
 import { PracticeService } from '@/services/practice.service';
 import { UnsubscriberService } from '@/services/unsubscriber.service';
-import { YamlService } from '@/services/yaml.service';
 import { ToastService } from '@/utility/services/toast.service';
 import { ActivatedRoute } from '@angular/router';
 import { FeedbackTemplateView } from '@/feedback/feedback.models';
@@ -167,7 +165,7 @@ export class GameCenterSettingsComponent implements AfterViewInit {
     if (game.minTeamSize > game.maxTeamSize)
       return false;
 
-    if (game.gameStart > game.gameEnd)
+    if (game.gameEnd && new Date(game.gameEnd).getFullYear() > 1 && game.gameStart > game.gameEnd)
       return false;
 
     if (game.registrationType == GameRegistrationType.open && game.registrationOpen > game.registrationClose)
diff --git a/projects/gameboard-ui/src/app/api/feedback.service.ts b/projects/gameboard-ui/src/app/api/feedback.service.ts
index 363694dd3..790606971 100644
--- a/projects/gameboard-ui/src/app/api/feedback.service.ts
+++ b/projects/gameboard-ui/src/app/api/feedback.service.ts
@@ -19,8 +19,11 @@ export class FeedbackService {
   private url = '';
   private yamlService = inject(YamlService);
 
-  private _deleted$ = new Subject<string>();
-  public deleted$ = this._deleted$.asObservable();
+  private _templatesDeleted$ = new Subject<string>();
+  public templatesDeleted$ = this._templatesDeleted$.asObservable();
+
+  private _templatesUpdated$ = new Subject<void>();
+  public templatesUpdated$ = this._templatesUpdated$.asObservable();
 
   constructor(
     config: ConfigService,
@@ -47,7 +50,7 @@ export class FeedbackService {
 
   public async deleteTemplate(template: FeedbackTemplateView) {
     await firstValueFrom(this.http.delete(`${this.url}/feedback/template/${template.id}`));
-    this._deleted$.next(template.id);
+    this._templatesDeleted$.next(template.id);
   }
 
   public async getTemplate(templateId: string): Promise<FeedbackTemplateView> {
diff --git a/projects/gameboard-ui/src/app/api/game-models.ts b/projects/gameboard-ui/src/app/api/game-models.ts
index 8129cd4eb..c401e17fd 100644
--- a/projects/gameboard-ui/src/app/api/game-models.ts
+++ b/projects/gameboard-ui/src/app/api/game-models.ts
@@ -1,6 +1,7 @@
 // Copyright 2021 Carnegie Mellon University. All Rights Reserved.
 // Released under a MIT (SEI)-style license. See LICENSE.md in the project root for license information.
 
+import { DateTime } from "luxon";
 import { FeedbackTemplate } from "./feedback-models";
 import { SimpleEntity } from "./models";
 import { Player, PlayerMode, TimeWindow } from "./player-models";
@@ -36,6 +37,7 @@ export interface GameDetail {
   maxTeamSize: number;
   sessionMinutes: number;
   sessionLimit: number;
+  sessionAvailabilityWarningThreshold?: number;
   gamespaceLimitPerSession: number;
   isPublished: boolean;
   requireSponsoredTeam: boolean;
@@ -169,6 +171,12 @@ export interface UpsertExternalGameHost {
   teamExtendedEndpoint?: string;
 }
 
+export interface GameSessionAvailibilityResponse {
+  nextSessionEnd?: DateTime
+  sessionsAvailable: number
+}
+
+
 export interface GetExternalTeamDataResponse {
   teamId: string;
   externalUrl: string;
diff --git a/projects/gameboard-ui/src/app/api/game.service.ts b/projects/gameboard-ui/src/app/api/game.service.ts
index d560ca7e6..fda7bbb53 100644
--- a/projects/gameboard-ui/src/app/api/game.service.ts
+++ b/projects/gameboard-ui/src/app/api/game.service.ts
@@ -8,7 +8,7 @@ import { map, tap } from 'rxjs/operators';
 import { SyncStartGameState } from '../game/game.models';
 import { ConfigService } from '../utility/config.service';
 import { ChallengeGate } from './board-models';
-import { ChangedGame, Game, GameGroup, NewGame, SessionForecast, UploadedFile } from './game-models';
+import { ChangedGame, Game, GameGroup, GameSessionAvailibilityResponse, NewGame, SessionForecast, UploadedFile } from './game-models';
 import { TimeWindow } from './player-models';
 import { Spec } from './spec-models';
 import { YamlService } from '@/services/yaml.service';
@@ -83,6 +83,10 @@ export class GameService {
     return firstValueFrom(this.http.post(`${this.url}/game/${gameId}/resources`, { teamIds }));
   }
 
+  public getSessionAvailability(gameId: string): Promise<GameSessionAvailibilityResponse> {
+    return firstValueFrom(this.http.get<GameSessionAvailibilityResponse>(`${this.url}/game/${gameId}/session-availability`));
+  }
+
   public getSyncStartState(gameId: string): Observable<SyncStartGameState> {
     return this.http.get<SyncStartGameState>(`${this.url}/game/${gameId}/ready`);
   }
diff --git a/projects/gameboard-ui/src/app/app.module.ts b/projects/gameboard-ui/src/app/app.module.ts
index 958f6998a..b70149f8f 100644
--- a/projects/gameboard-ui/src/app/app.module.ts
+++ b/projects/gameboard-ui/src/app/app.module.ts
@@ -35,6 +35,8 @@ import { SignalRService } from './services/signalR/signalr.service';
 import { LogService } from './services/log.service';
 import { SystemNotificationsModule } from './system-notifications/system-notifications.module';
 import { UserNavItemComponent } from './standalone/user/components/user-nav-item/user-nav-item.component';
+import { markedOptionsFactory } from './core/config/marked.config';
+import { MarkdownModule, MarkedOptions } from 'ngx-markdown';
 
 @NgModule({
   declarations: [
@@ -54,6 +56,7 @@ import { UserNavItemComponent } from './standalone/user/components/user-nav-item
     SystemNotificationsModule,
     CoreModule,
     UtilityModule,
+    MarkdownModule.forRoot(),
     TooltipModule.forRoot(),
     TypeaheadModule.forRoot(),
     ButtonsModule.forRoot(),
@@ -76,6 +79,10 @@ import { UserNavItemComponent } from './standalone/user/components/user-nav-item
       useFactory: (config: ConfigService, log: LogService, userService: UserService) => new SignalRService(config, log, userService),
       deps: [ConfigService, LogService, UserService],
     },
+    {
+      provide: MarkedOptions,
+      useFactory: markedOptionsFactory
+    },
     {
       provide: [NotificationService],
       useFactory: () => NotificationService,
diff --git a/projects/gameboard-ui/src/app/core/config/marked.config.ts b/projects/gameboard-ui/src/app/core/config/marked.config.ts
index 2e42c6948..56091d151 100644
--- a/projects/gameboard-ui/src/app/core/config/marked.config.ts
+++ b/projects/gameboard-ui/src/app/core/config/marked.config.ts
@@ -7,6 +7,10 @@ export function markedOptionsFactory(): MarkedOptions {
         return `<div class="text-center"><img class="img-fluid rounded" src=${href} alt="${text}" /></div>`;
     };
 
+    renderer.link = (href, title, text) => {
+        return `<a role="link" target="_blank" href="${href}" rel="nofollow noopener noreferrer">${text}</a>`;
+    };
+
     renderer.blockquote = (quote) => {
         return `<blockquote class="blockquote">${quote}</blockquote>`;
     };
diff --git a/projects/gameboard-ui/src/app/core/core.module.ts b/projects/gameboard-ui/src/app/core/core.module.ts
index 1fc22fb16..ffe38ee76 100644
--- a/projects/gameboard-ui/src/app/core/core.module.ts
+++ b/projects/gameboard-ui/src/app/core/core.module.ts
@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { ModuleWithProviders, NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { HTTP_INTERCEPTORS, HttpClient, HttpClientModule } from '@angular/common/http';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -19,7 +19,6 @@ import { TypeaheadModule } from 'ngx-bootstrap/typeahead';
 
 // other 3rd party modules
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { MarkdownModule, MarkedOptions } from 'ngx-markdown';
 import { NgChartsModule } from 'ng2-charts';
 // import luxon adapter for chartjs
 import 'chartjs-adapter-luxon';
@@ -120,9 +119,9 @@ import { ObserverConsoleComponent } from './components/observer-console/observer
 import { TicketLabelPickerComponent } from './components/ticket-label-picker/ticket-label-picker.component';
 import { GameMapImageUrlPipe } from './pipes/game-map-image-url.pipe';
 import { SpinnerComponent } from '@/standalone/core/components/spinner/spinner.component';
-import { ErrorDivComponent } from '@/standalone/core/components/error-div/error-div.component';
 import { IfHasPermissionDirective } from '@/standalone/directives/if-has-permission.directive';
 import { ToSupportCodePipe } from '@/standalone/core/pipes/to-support-code.pipe';
+import { MarkdownModule } from 'ngx-markdown';
 
 const PUBLIC_DECLARATIONS = [
   AbsoluteValuePipe,
@@ -260,19 +259,11 @@ const RELAYED_MODULES = [
     HttpClientModule,
     ProgressbarModule,
     TooltipModule,
-    MarkdownModule.forRoot({
-      loader: HttpClient,
-      markedOptions: {
-        provide: MarkedOptions,
-        useFactory: markedOptionsFactory,
-      },
-    }),
     PopoverModule.forRoot(),
     TypeaheadModule.forRoot(),
     ...RELAYED_MODULES,
 
     // standalones
-    ErrorDivComponent,
     IfHasPermissionDirective,
     SpinnerComponent,
     ToSupportCodePipe
@@ -281,7 +272,7 @@ const RELAYED_MODULES = [
     CommonModule,
     ...RELAYED_MODULES,
     ...PUBLIC_DECLARATIONS,
-    IfHasPermissionDirective,
+    IfHasPermissionDirective
   ]
 })
 export class CoreModule { }
diff --git a/projects/gameboard-ui/src/app/feedback/components/feedback-submission-form/feedback-submission-form.component.html b/projects/gameboard-ui/src/app/feedback/components/feedback-submission-form/feedback-submission-form.component.html
index 3edfde1fe..0952a5a8c 100644
--- a/projects/gameboard-ui/src/app/feedback/components/feedback-submission-form/feedback-submission-form.component.html
+++ b/projects/gameboard-ui/src/app/feedback/components/feedback-submission-form/feedback-submission-form.component.html
@@ -63,7 +63,8 @@
                                         [disabled]="feedbackForm.submitted! || isPreview" id="check-{{q.id}}-{{option}}"
                                         [name]="q.id" [value]="option">
 
-                                    {{option}}{{q.specify && q.specify.key ==
+                                    <span [innerHTML]="option | markdown"></span>
+                                    {{q.specify && q.specify.key ==
                                     option ? ": " +
                                     (q.specify.prompt ? q.specify.prompt : "") : "" }}
                                 </label>
@@ -87,10 +88,10 @@
                                     [checked]="q.answer && q.answer!.indexOf(option) > -1"
                                     [disabled]="feedbackForm.submitted!" id="check-{{q.id}}-{{option}}" [name]="option"
                                     [value]="option">
-                                <label class="form-check-label" for="{{option}}">{{option}}{{q.specify && q.specify.key
-                                    ==
-                                    option ? ": " +
-                                    (q.specify.prompt ? q.specify.prompt : "") : "" }}</label>
+                                <label class="form-check-label" for="{{option}}">
+                                    <span [innerHTML]="option | markdown"></span>
+                                    {{q.specify && q.specify.key == option ? ": " + (q.specify.prompt ?
+                                    q.specify.prompt : "") : "" }}</label>
                                 <br>
                                 <textarea *ngIf="q.specify && q.specify.key == option" rows="1" type="text"
                                     [disabled]="feedbackForm.submitted!"
@@ -146,3 +147,7 @@
 <ng-template #noResponse>
     <em>(no response)</em>
 </ng-template>
+
+<ng-template #markdownOption let-content>
+    <span [innerHTML]="content | markdown"></span>
+</ng-template>
diff --git a/projects/gameboard-ui/src/app/feedback/components/feedback-submission-form/feedback-submission-form.component.ts b/projects/gameboard-ui/src/app/feedback/components/feedback-submission-form/feedback-submission-form.component.ts
index 0b762e459..b5676427b 100644
--- a/projects/gameboard-ui/src/app/feedback/components/feedback-submission-form/feedback-submission-form.component.ts
+++ b/projects/gameboard-ui/src/app/feedback/components/feedback-submission-form/feedback-submission-form.component.ts
@@ -2,7 +2,7 @@ import { Component, inject, Input, OnDestroy, OnInit, ViewChild } from '@angular
 import { CommonModule } from '@angular/common';
 import { FormGroup, NgForm } from '@angular/forms';
 import { DateTime } from 'luxon';
-import { catchError, debounceTime, delay, filter, Observable, of, Subscription, tap } from 'rxjs';
+import { catchError, debounceTime, delay, filter, of, Subscription, tap } from 'rxjs';
 import { fa } from '@/services/font-awesome.service';
 import { UserService as LocalUserService } from '@/utility/user.service';
 import { FeedbackSubmissionAttachedEntity, FeedbackSubmissionView, FeedbackTemplateView } from '@/feedback/feedback.models';
@@ -12,6 +12,8 @@ import { ErrorDivComponent } from '@/standalone/core/components/error-div/error-
 import { CoreModule } from '@/core/core.module';
 import { FeedbackQuestion } from '@/api/feedback-models';
 import { SpinnerComponent } from '@/standalone/core/components/spinner/spinner.component';
+import { MarkedOptions } from 'ngx-markdown';
+import { markedOptionsFactory } from '@/core/config/marked.config';
 
 @Component({
   selector: 'app-feedback-submission-form',
@@ -25,6 +27,9 @@ import { SpinnerComponent } from '@/standalone/core/components/spinner/spinner.c
     ErrorDivComponent,
     SpinnerComponent
   ],
+  providers: [
+    { provide: MarkedOptions, useFactory: markedOptionsFactory }
+  ],
   templateUrl: './feedback-submission-form.component.html',
   styleUrls: ['./feedback-submission-form.component.scss']
 })
diff --git a/projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.html b/projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.html
index 1d0a2ec10..e38632a08 100644
--- a/projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.html
+++ b/projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.html
@@ -23,9 +23,15 @@
                         tooltip="Preview this feedback template">
                         <fa-icon [icon]="fa.eye"></fa-icon>
                     </button>
-                    <button type="button" class="btn btn-success btn-sm" (click)="handleEdit(selectedTemplate)">
+                    <button *ngIf="selectedTemplate.responseCount == 0" type="button" class="btn btn-success btn-sm"
+                        (click)="handleEdit(selectedTemplate)">
                         <fa-icon [icon]="fa.edit"></fa-icon>
                     </button>
+                    <button type="button" class="btn btn-success btn-sm" [appCopyOnClick]="selectedTemplate.content"
+                        tooltip="Copy this template's YAML configuration"
+                        appCopyOnClickMessage="Copied this template's YAML to your clipboard.">
+                        <fa-icon [icon]="fa.copy"></fa-icon>
+                    </button>
                     <button type="button" class="btn btn-danger btn-sm" (click)="handleDelete(selectedTemplate)">
                         <fa-icon [icon]="fa.trash"></fa-icon>
                     </button>
diff --git a/projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.ts b/projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.ts
index 045ff8cea..9f3ed20ef 100644
--- a/projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.ts
+++ b/projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.ts
@@ -62,7 +62,8 @@ export class FeedbackTemplatePickerComponent implements OnInit {
     await this.load();
 
     this.unsub.add(
-      this.feedbackService.deleted$.subscribe(async () => await this.load())
+      this.feedbackService.templatesDeleted$.subscribe(async () => await this.load()),
+      this.feedbackService.templatesUpdated$.subscribe(async () => await this.load())
     );
   }
 
diff --git a/projects/gameboard-ui/src/app/game/components/game-session-availability-warning/game-session-availability-warning.component.html b/projects/gameboard-ui/src/app/game/components/game-session-availability-warning/game-session-availability-warning.component.html
new file mode 100644
index 000000000..06bf4306f
--- /dev/null
+++ b/projects/gameboard-ui/src/app/game/components/game-session-availability-warning/game-session-availability-warning.component.html
@@ -0,0 +1,18 @@
+<alert type="danger" class="m-4"
+    *ngIf="!!availability && !!game && game.sessionAvailabilityWarningThreshold && availability.sessionsAvailable < game.sessionAvailabilityWarningThreshold">
+    This game limits the number of simultaneous players. Currently, there are
+    <strong>
+        {{ availability.sessionsAvailable == 0 ? "no" : availability.sessionsAvailable + ' ' + ('session' |
+        pluralizer:availability.sessionsAvailable)
+        }}
+        sessions
+    </strong>
+    available. This estimate is only updated periodically, so if you're unable to start a session, please try again in a
+    bit.
+    <ng-container *ngIf="availability.nextSessionEnd">
+        The next active session to end will do so at
+        <strong>
+            {{ availability.nextSessionEnd | friendlyDateAndTime }}
+        </strong>.
+    </ng-container>
+</alert>
diff --git a/projects/gameboard-ui/src/app/admin/components/feedback-editor/feedback-editor.component.scss b/projects/gameboard-ui/src/app/game/components/game-session-availability-warning/game-session-availability-warning.component.scss
similarity index 100%
rename from projects/gameboard-ui/src/app/admin/components/feedback-editor/feedback-editor.component.scss
rename to projects/gameboard-ui/src/app/game/components/game-session-availability-warning/game-session-availability-warning.component.scss
diff --git a/projects/gameboard-ui/src/app/game/components/game-session-availability-warning/game-session-availability-warning.component.ts b/projects/gameboard-ui/src/app/game/components/game-session-availability-warning/game-session-availability-warning.component.ts
new file mode 100644
index 000000000..d4a9e4027
--- /dev/null
+++ b/projects/gameboard-ui/src/app/game/components/game-session-availability-warning/game-session-availability-warning.component.ts
@@ -0,0 +1,41 @@
+import { Component, inject, Input, OnDestroy, OnInit } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { GameService } from '@/api/game.service';
+import { UnsubscriberService } from '@/services/unsubscriber.service';
+import { interval, startWith } from 'rxjs';
+import { GameSessionAvailibilityResponse } from '@/api/game-models';
+import { CoreModule } from '@/core/core.module';
+
+@Component({
+  selector: 'app-game-session-availability-warning',
+  standalone: true,
+  imports: [
+    CommonModule,
+    CoreModule,
+  ],
+  providers: [UnsubscriberService],
+  templateUrl: './game-session-availability-warning.component.html',
+  styleUrls: ['./game-session-availability-warning.component.scss']
+})
+export class GameSessionAvailabilityWarningComponent implements OnInit, OnDestroy {
+  @Input() game?: { id: string; sessionAvailabilityWarningThreshold?: number };
+
+  private _gameService = inject(GameService);
+  private _unsub = inject(UnsubscriberService);
+
+  protected availability?: GameSessionAvailibilityResponse;
+
+  ngOnInit(): void {
+    this._unsub.add(
+      interval(300000).pipe(startWith(0)).subscribe(async () => {
+        if (this.game?.id) {
+          this.availability = await this._gameService.getSessionAvailability(this.game.id);
+        }
+      })
+    );
+  }
+
+  ngOnDestroy(): void {
+    this._unsub.unsubscribeAll();
+  }
+}
diff --git a/projects/gameboard-ui/src/app/game/game.module.ts b/projects/gameboard-ui/src/app/game/game.module.ts
index 99823222e..8ba021b39 100644
--- a/projects/gameboard-ui/src/app/game/game.module.ts
+++ b/projects/gameboard-ui/src/app/game/game.module.ts
@@ -40,6 +40,7 @@ import { ErrorDivComponent } from '@/standalone/core/components/error-div/error-
 import { SafeUrlPipe } from '@/standalone/core/pipes/safe-url.pipe';
 import { ScoreboardPageComponent } from '@/scoreboard/components/scoreboard-page/scoreboard-page.component';
 import { FeedbackSubmissionFormComponent } from "../feedback/components/feedback-submission-form/feedback-submission-form.component";
+import { GameSessionAvailabilityWarningComponent } from "./components/game-session-availability-warning/game-session-availability-warning.component";
 
 const MODULE_DECLARATIONS = [
   CertificateComponent,
@@ -88,7 +89,8 @@ const MODULE_DECLARATIONS = [
     FeedbackSubmissionFormComponent,
     SafeUrlPipe,
     SpinnerComponent,
-    FeedbackSubmissionFormComponent
+    FeedbackSubmissionFormComponent,
+    GameSessionAvailabilityWarningComponent
   ]
 })
 export class GameModule { }
diff --git a/projects/gameboard-ui/src/app/game/pages/game-page/game-page.component.html b/projects/gameboard-ui/src/app/game/pages/game-page/game-page.component.html
index 91baabba5..1aae69579 100644
--- a/projects/gameboard-ui/src/app/game/pages/game-page/game-page.component.html
+++ b/projects/gameboard-ui/src/app/game/pages/game-page/game-page.component.html
@@ -24,10 +24,14 @@
   <app-external-game-link-banner *ngIf="ctx?.player?.teamId && ctx?.game?.id" [gameId]="ctx.game.id"
     [teamId]="ctx.player.teamId"></app-external-game-link-banner>
 
-  <app-late-start-banner *ngIf="ctx?.player && ctx?.game && !ctx?.player?.session?.isDuring"
+  <app-late-start-banner *ngIf="ctx?.player?.teamId && ctx?.game && !ctx?.player?.session?.isDuring"
     [sessionLengthMinutes]="ctx.game.sessionMinutes" [gameEnd]="ctx.game.gameEnd | apiDate"
     [gameAllowsLateStart]="ctx.game.allowLateStart"></app-late-start-banner>
 
+  <!--if the user is registered, and if they haven't started yet, enable the availability checker (depends on the game's settings) -->
+  <app-game-session-availability-warning *ngIf="ctx.player?.teamId && ctx.player?.session?.isBefore"
+    [game]="ctx.game"></app-game-session-availability-warning>
+
   <div class="container-fluid">
     <div class="p-4">
       <markdown [data]="ctx.game.gameMarkdown"></markdown>
@@ -57,23 +61,25 @@ <h2 class="d-inline">Certificate</h2>
       <!-- if auth'd -->
       <ng-container *ngIf="!!ctx.user.id">
 
-        <!-- if enrolled -->
-        <ng-container *ngIf="!!ctx.player.id && ctx.player.session">
-          <div class="col panel">
-            <h2>Status</h2>
-            <app-player-session [ctx$]="ctx$!" (onSessionStart)="onSessionStarted($event)"
-              (onSessionReset)="onSessionReset($event)"></app-player-session>
-          </div>
-        </ng-container>
+        <ng-container *ngIf="!ctx.game.isPracticeMode; else practiceMode">
+          <!-- if enrolled -->
+          <ng-container *ngIf="!!ctx.player.id && ctx.player.session">
+            <div class="col panel">
+              <h2>Status</h2>
+              <app-player-session [ctx$]="ctx$!" (onSessionStart)="onSessionStarted($event)"
+                (onSessionReset)="onSessionReset($event)"></app-player-session>
+            </div>
+          </ng-container>
 
-        <!-- if session hasn't started -->
-        <ng-container
-          *ngIf="(!ctx.game.registration.isAfter || (canAdminEnroll$ | async)) && (!ctx.player.id || !ctx.player.session || ctx.player.session.isBefore)">
-          <div class="col panel">
-            <h2>Enrollment</h2>
-            <app-player-enroll [ctx]="ctx" (onEnroll)="onEnroll($event)"
-              (onUnenroll)="onUnenroll($event)"></app-player-enroll>
-          </div>
+          <!-- if session hasn't started -->
+          <ng-container
+            *ngIf="(!ctx.game.registration.isAfter || (canAdminEnroll$ | async)) && (!ctx.player.id || !ctx.player.session || ctx.player.session.isBefore)">
+            <div class="col panel">
+              <h2>Enrollment</h2>
+              <app-player-enroll [ctx]="ctx" (onEnroll)="onEnroll($event)"
+                (onUnenroll)="onUnenroll($event)"></app-player-enroll>
+            </div>
+          </ng-container>
         </ng-container>
       </ng-container>
 
@@ -114,3 +120,17 @@ <h2>Feedback</h2>
 
   <app-spinner></app-spinner>
 </ng-template>
+
+<ng-template #practiceMode>
+  <div class="col panel">
+    <h2>Practice Mode</h2>
+
+    <div class="card p-4">
+      <p class="text-muted">
+        This game is now in Practice mode. If you want to try your hand
+        at its challenges, head over to the
+        <a [href]="practiceUrl">Practice Area</a>.
+      </p>
+    </div>
+  </div>
+</ng-template>
diff --git a/projects/gameboard-ui/src/app/game/pages/game-page/game-page.component.ts b/projects/gameboard-ui/src/app/game/pages/game-page/game-page.component.ts
index 802a30a6a..3b2e43454 100644
--- a/projects/gameboard-ui/src/app/game/pages/game-page/game-page.component.ts
+++ b/projects/gameboard-ui/src/app/game/pages/game-page/game-page.component.ts
@@ -47,6 +47,7 @@ export class GamePageComponent implements OnDestroy {
   protected fa = fa;
   protected isExternalGame = false;
   protected player$ = new BehaviorSubject<Player | null>(null);
+  protected practiceUrl = "";
 
   private hubEventsSubcription: Subscription;
   private localUserSubscription: Subscription;
@@ -79,6 +80,7 @@ export class GamePageComponent implements OnDestroy {
       tap(g => this.ctxIds.gameId = g.id),
       tap(g => this.isExternalGame = g.mode == "external"),
       tap(g => this.titleService.set(g.name)),
+      tap(g => this.practiceUrl = this.routerService.getPracticeAreaUrl(g.id).toString()),
     );
 
     this.localUserSubscription = combineLatest([
diff --git a/projects/gameboard-ui/src/app/home/landing/landing.component.html b/projects/gameboard-ui/src/app/home/landing/landing.component.html
index 6a60a7dbb..394f75b88 100644
--- a/projects/gameboard-ui/src/app/home/landing/landing.component.html
+++ b/projects/gameboard-ui/src/app/home/landing/landing.component.html
@@ -108,7 +108,7 @@ <h5 class="mb-0 font-weight-bold">Competition<fa-icon [icon]="faGamepad" class="
           <p class="mb-0 pb-0" *ngIf="game.session.isAfter">Ended {{game.gameEnd | ago}}</p>
           <button class="btn btn-outline-success btn-lg mx-1 mt-4 open-button" (click)="selected(game)">
             <h2 class="p-0 m-0 font-weight-bold">
-              {{ game.isPracticeMode ? "Practice" : "Open Game" }}
+              Open Game
             </h2>
           </button>
         </div>
diff --git a/projects/gameboard-ui/src/app/home/landing/landing.component.ts b/projects/gameboard-ui/src/app/home/landing/landing.component.ts
index 71890a8c1..3937d9bba 100644
--- a/projects/gameboard-ui/src/app/home/landing/landing.component.ts
+++ b/projects/gameboard-ui/src/app/home/landing/landing.component.ts
@@ -66,11 +66,7 @@ export class LandingComponent {
   }
 
   selected(game: Game | BoardGame): void {
-    if (game.isPracticeMode) {
-      this.routerService.toPracticeAreaWithSearch(game.id);
-    } else {
-      this.router.navigate(['/game', game.id]);
-    }
+    this.router.navigate(['/game', game.id]);
   }
 
   on(g: Game): void {
diff --git a/projects/gameboard-ui/src/app/reports/components/reports/enrollment-report/enrollment-report-trend/enrollment-report-trend.component.html b/projects/gameboard-ui/src/app/reports/components/reports/enrollment-report/enrollment-report-trend/enrollment-report-trend.component.html
index e8e5ad298..7cacded93 100644
--- a/projects/gameboard-ui/src/app/reports/components/reports/enrollment-report/enrollment-report-trend/enrollment-report-trend.component.html
+++ b/projects/gameboard-ui/src/app/reports/components/reports/enrollment-report/enrollment-report-trend/enrollment-report-trend.component.html
@@ -1,3 +1,10 @@
 <div class="trend-line-container mt-4" *ngIf="chartConfig">
+    <div class="trend-controls ml-3">
+        <label>
+            <input type="checkbox" [(ngModel)]="groupByGame" class="d-inline form-check"
+                (change)="handleGroupByGameChange()">
+            Show breakdown by game
+        </label>
+    </div>
     <app-line-chart id="enrollmentTrend" [config]="chartConfig"></app-line-chart>
 </div>
diff --git a/projects/gameboard-ui/src/app/reports/components/reports/enrollment-report/enrollment-report-trend/enrollment-report-trend.component.ts b/projects/gameboard-ui/src/app/reports/components/reports/enrollment-report/enrollment-report-trend/enrollment-report-trend.component.ts
index c3d61e764..0c6edf039 100644
--- a/projects/gameboard-ui/src/app/reports/components/reports/enrollment-report/enrollment-report-trend/enrollment-report-trend.component.ts
+++ b/projects/gameboard-ui/src/app/reports/components/reports/enrollment-report/enrollment-report-trend/enrollment-report-trend.component.ts
@@ -1,17 +1,19 @@
-import { Component, Input, OnInit, SimpleChanges } from '@angular/core';
-import { EnrollmentReportFlatParameters } from '../enrollment-report.models';
+import { Component, Input, SimpleChanges } from '@angular/core';
+import { EnrollmentReportFlatParameters, EnrollmentReportLineChartViewModel } from '../enrollment-report.models';
 import { EnrollmentReportService } from '../enrollment-report.service';
 import { LineChartConfig } from '@/core/components/line-chart/line-chart.component';
+import { DateTime } from 'luxon';
 
 @Component({
   selector: 'app-enrollment-report-trend',
   templateUrl: './enrollment-report-trend.component.html',
   styleUrls: ['./enrollment-report-trend.component.scss']
 })
-export class EnrollmentReportTrendComponent implements OnInit {
+export class EnrollmentReportTrendComponent {
   @Input() parameters: EnrollmentReportFlatParameters | null = null;
 
   protected chartConfig?: LineChartConfig;
+  protected groupByGame = false;
 
   constructor(private enrollmentReportService: EnrollmentReportService) { }
 
@@ -19,16 +21,32 @@ export class EnrollmentReportTrendComponent implements OnInit {
     if (!changes.parameters)
       return;
 
+    await this.loadChart();
+  }
+
+  protected async handleGroupByGameChange() {
+    await this.loadChart();
+  }
+
+  private async loadChart() {
     const lineChartResults = await this.enrollmentReportService.getTrendData(this.parameters);
+    if (this.groupByGame) {
+      this.buildLineChartByGameByDate(lineChartResults);
+    } else {
+      this.buildLineChartByDate(lineChartResults);
+    }
+  }
+
+  private buildLineChartByDate(viewModel: EnrollmentReportLineChartViewModel) {
     this.chartConfig = {
       type: 'line',
       data: {
-        labels: Array.from(lineChartResults.keys()).map(k => k as any),
+        labels: Array.from(viewModel.byDate.keys()).map(k => k as any),
         datasets: [
           {
             label: "Enrolled players",
-            data: Array.from(lineChartResults.values()).map(g => g.totalCount),
-            backgroundColor: 'blue',
+            data: Array.from(viewModel.byDate.values()),
+            backgroundColor: 'green',
           },
         ]
       },
@@ -59,7 +77,40 @@ export class EnrollmentReportTrendComponent implements OnInit {
     };
   }
 
-  async ngOnInit(): Promise<void> {
-
+  private buildLineChartByGameByDate(viewModel: EnrollmentReportLineChartViewModel) {
+    this.chartConfig = {
+      type: 'line',
+      data: {
+        labels: Array.from(viewModel.byDate.keys()).map(k => k as any),
+        datasets: Array.from(viewModel.byGameByDate.keys()).map(gameId => ({
+          label: viewModel.gameNames[gameId],
+          data: Array.from(viewModel.byGameByDate.get(gameId)!.values())
+        }))
+      },
+      options: {
+        scales: {
+          x: {
+            type: 'time',
+            time: {
+              displayFormats: {
+                day: "MM/dd/yy",
+              },
+              tooltipFormat: 'DD',
+              unit: "day"
+            },
+            title: {
+              display: true,
+              text: "Enrollment Date"
+            }
+          },
+          y: {
+            title: {
+              display: true,
+              text: "Players Enrolled"
+            }
+          }
+        }
+      }
+    };
   }
 }
diff --git a/projects/gameboard-ui/src/app/reports/components/reports/enrollment-report/enrollment-report.models.ts b/projects/gameboard-ui/src/app/reports/components/reports/enrollment-report/enrollment-report.models.ts
index 9e125ce27..bc96d4139 100644
--- a/projects/gameboard-ui/src/app/reports/components/reports/enrollment-report/enrollment-report.models.ts
+++ b/projects/gameboard-ui/src/app/reports/components/reports/enrollment-report/enrollment-report.models.ts
@@ -88,18 +88,34 @@ export interface EnrollmentReportStatSummary {
 }
 
 export interface EnrollmentReportLineChartResponse {
-    playerGroups: { [dateString: string]: EnrollmentReportLineChartGroup };
+    byDate: { [dateString: string]: number }
+    byGameByDate: {
+        [gameId: string]: {
+            [dateString: string]: number;
+        }
+    }
+    games: { [gameId: string]: string };
+    // players: { [playerId: string]: EnrollmentReportLineChartPlayer }
     periodType: string;
     periodStart: DateTime;
     periodEnd: DateTime;
 }
 
-export interface EnrollmentReportLineChartGroup {
-    totalCount: number;
-    players: {
-        id: string;
-        name: string;
-        game: SimpleEntity,
-        enrollDate: Date
-    }[];
+// export interface EnrollmentReportLineChartPlayer {
+//     id: string;
+//     name: string;
+//     game: SimpleEntity;
+//     enrollDate: Date;
+// }
+
+// export interface EnrollmentReportLineChartPlayerGame {
+//     id: string;
+//     gameId: string;
+// }
+
+// these are client side models that represents the data after it's been structured from the API
+export interface EnrollmentReportLineChartViewModel {
+    byDate: Map<DateTime, number>;
+    byGameByDate: Map<string, Map<DateTime, number>>;
+    gameNames: { [gameId: string]: string };
 }
diff --git a/projects/gameboard-ui/src/app/reports/components/reports/enrollment-report/enrollment-report.service.ts b/projects/gameboard-ui/src/app/reports/components/reports/enrollment-report/enrollment-report.service.ts
index 89d4f0aee..c8c0acf0f 100644
--- a/projects/gameboard-ui/src/app/reports/components/reports/enrollment-report/enrollment-report.service.ts
+++ b/projects/gameboard-ui/src/app/reports/components/reports/enrollment-report/enrollment-report.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { EnrollmentReportByGameRecord, EnrollmentReportFlatParameters, EnrollmentReportLineChartGroup, EnrollmentReportLineChartResponse, EnrollmentReportRecord, EnrollmentReportStatSummary } from './enrollment-report.models';
+import { EnrollmentReportByGameRecord, EnrollmentReportFlatParameters, EnrollmentReportLineChartViewModel, EnrollmentReportLineChartResponse, EnrollmentReportRecord, EnrollmentReportStatSummary } from './enrollment-report.models';
 import { Observable, firstValueFrom, map, } from 'rxjs';
 import { ReportResults } from '@/reports/reports-models';
 import { ReportsService } from '@/reports/reports.service';
@@ -38,7 +38,7 @@ export class EnrollmentReportService {
     return this.http.get<EnrollmentReportStatSummary>(this.apiUrl.build("reports/enrollment/stats", parameters));
   }
 
-  async getTrendData(parameters: EnrollmentReportFlatParameters | null): Promise<Map<DateTime, EnrollmentReportLineChartGroup>> {
+  async getTrendData(parameters: EnrollmentReportFlatParameters | null): Promise<EnrollmentReportLineChartViewModel> {
     // ignore paging/tab parameters for the line chart
     const trendParams = { ...(parameters || {}) };
     delete trendParams.tab;
@@ -50,13 +50,28 @@ export class EnrollmentReportService {
       .get<EnrollmentReportLineChartResponse>(this.apiUrl.build("reports/enrollment/trend", trendParams))
       .pipe(
         map(results => {
-          const mapped = new Map<DateTime, EnrollmentReportLineChartGroup>();
+          const byDate = new Map<DateTime, number>();
+          const byGameByDate = new Map<string, Map<DateTime, number>>();
 
-          for (const entry of Object.entries(results.playerGroups)) {
-            mapped.set(DateTime.fromISO(entry[0]), entry[1]);
+          for (const group of Object.entries(results.byDate)) {
+            byDate.set(DateTime.fromISO(group[0]), group[1]);
           }
 
-          return mapped;
+          for (const gameGroup of Object.entries(results.byGameByDate)) {
+            const gameDateGroups = new Map<DateTime, number>();
+
+            for (const dateGroup of Object.entries(gameGroup[1])) {
+              gameDateGroups.set(DateTime.fromISO(dateGroup[0]), dateGroup[1]);
+            }
+
+            byGameByDate.set(gameGroup[0], gameDateGroups);
+          }
+
+          return {
+            byDate,
+            byGameByDate,
+            gameNames: results.games,
+          } as EnrollmentReportLineChartViewModel;
         })
       )
     );
diff --git a/projects/gameboard-ui/src/app/standalone/core/components/error-div/error-div.component.ts b/projects/gameboard-ui/src/app/standalone/core/components/error-div/error-div.component.ts
index d6731931b..889c13a91 100644
--- a/projects/gameboard-ui/src/app/standalone/core/components/error-div/error-div.component.ts
+++ b/projects/gameboard-ui/src/app/standalone/core/components/error-div/error-div.component.ts
@@ -3,7 +3,6 @@
 
 import { CommonModule } from '@angular/common';
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { MarkdownModule } from 'ngx-markdown';
 import { CamelspacePipe } from '../../pipes/camelspace.pipe';
 import { AlertModule } from 'ngx-bootstrap/alert';
 
@@ -13,7 +12,6 @@ import { AlertModule } from 'ngx-bootstrap/alert';
   imports: [
     CommonModule,
     AlertModule,
-    MarkdownModule,
     CamelspacePipe
   ],
   template: `
diff --git a/projects/gameboard-ui/src/app/system-notifications/components/create-edit-system-notification-modal/create-edit-system-notification-modal.component.ts b/projects/gameboard-ui/src/app/system-notifications/components/create-edit-system-notification-modal/create-edit-system-notification-modal.component.ts
index 72eefcadb..a7d79adc7 100644
--- a/projects/gameboard-ui/src/app/system-notifications/components/create-edit-system-notification-modal/create-edit-system-notification-modal.component.ts
+++ b/projects/gameboard-ui/src/app/system-notifications/components/create-edit-system-notification-modal/create-edit-system-notification-modal.component.ts
@@ -40,6 +40,7 @@ export class CreateEditSystemNotificationModalComponent implements OnInit {
   }
 
   protected async handleSave(model: CreateEditSystemNotification) {
+    model.isDismissible = model.isDismissible || false;
     if (model.id)
       await firstValueFrom(this.systemNotificationsService.updateNotification(model));
     else