diff --git a/api/Properties/launchSettings.json b/api/Properties/launchSettings.json
index 9c2b617..698411e 100644
--- a/api/Properties/launchSettings.json
+++ b/api/Properties/launchSettings.json
@@ -1,10 +1,11 @@
-{
+{
   "$schema": "https://json.schemastore.org/launchsettings.json",
   "profiles": {
     "http": {
       "commandName": "Project",
       "dotnetRunMessages": true,
-      "launchBrowser": false,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
       "applicationUrl": "http://localhost:5123",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/api/src/Controllers/AuthController.cs b/api/src/Controllers/AuthController.cs
index 909bebb..de550dc 100644
--- a/api/src/Controllers/AuthController.cs
+++ b/api/src/Controllers/AuthController.cs
@@ -405,4 +405,51 @@ public class AuthController : BaseController
             Message = "Logged out successfully."
         });
     }
+
+    // *****************************************************************
+    // Sets the password hash and salt for an existing user.
+    // Accepts a user ID and plaintext password, hashes it, and stores
+    // the result in the user table.
+    // *****************************************************************
+    [HttpPost("SetPassword")]
+    [ProducesResponseType(typeof(ResponseResult<object>), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(ResponseResult<object>), StatusCodes.Status400BadRequest)]
+    public async Task<ActionResult<ResponseResult<object>>> SetPassword([FromBody] SetPasswordDto dto)
+    {
+        if (string.IsNullOrWhiteSpace(dto.UserId) || string.IsNullOrWhiteSpace(dto.Password))
+        {
+            return BadRequest(new ResponseResult<object>
+            {
+                Success = false,
+                Message = "User ID and password are required."
+            });
+        }
+
+        if (!Guid.TryParse(dto.UserId, out Guid userId))
+        {
+            return BadRequest(new ResponseResult<object>
+            {
+                Success = false,
+                Message = "Invalid user ID format."
+            });
+        }
+
+        var (hash, salt) = PasswordHasher.HashPassword(dto.Password);
+        var updated = await _userRepo.SetPasswordAsync(userId, hash, salt);
+
+        if (!updated)
+        {
+            return Ok(new ResponseResult<object>
+            {
+                Success = false,
+                Message = "User not found."
+            });
+        }
+
+        return Ok(new ResponseResult<object>
+        {
+            Success = true,
+            Message = "Password set successfully."
+        });
+    }
 }
diff --git a/api/src/DataAccess/Models/DataTransferObjects/CreateGoalDto.cs b/api/src/DataAccess/Models/DataTransferObjects/CreateGoalDto.cs
index 4dad0a3..4ba2d39 100644
--- a/api/src/DataAccess/Models/DataTransferObjects/CreateGoalDto.cs
+++ b/api/src/DataAccess/Models/DataTransferObjects/CreateGoalDto.cs
@@ -2,8 +2,8 @@ namespace WinStudentGoalTracker.DataAccess;
 
 public class CreateGoalDto
 {
-    public string? Title { get; set; }
     public string? Description { get; set; }
     public string? Category { get; set; }
+    public string? Baseline { get; set; }
     public Guid? GoalParentId { get; set; }
 }
diff --git a/api/src/DataAccess/Models/DataTransferObjects/SetPasswordDto.cs b/api/src/DataAccess/Models/DataTransferObjects/SetPasswordDto.cs
new file mode 100644
index 0000000..9331d75
--- /dev/null
+++ b/api/src/DataAccess/Models/DataTransferObjects/SetPasswordDto.cs
@@ -0,0 +1,7 @@
+namespace WinStudentGoalTracker.DataAccess;
+
+public class SetPasswordDto
+{
+    public string? UserId { get; set; }
+    public string? Password { get; set; }
+}
diff --git a/api/src/DataAccess/Models/DataTransferObjects/UpdateGoalDto.cs b/api/src/DataAccess/Models/DataTransferObjects/UpdateGoalDto.cs
index 8310302..9c76f7c 100644
--- a/api/src/DataAccess/Models/DataTransferObjects/UpdateGoalDto.cs
+++ b/api/src/DataAccess/Models/DataTransferObjects/UpdateGoalDto.cs
@@ -2,7 +2,7 @@ namespace WinStudentGoalTracker.DataAccess;
 
 public class UpdateGoalDto
 {
-    public string? Title { get; set; }
     public string? Description { get; set; }
     public string? Category { get; set; }
+    public string? Baseline { get; set; }
 }
diff --git a/api/src/DataAccess/Models/DatabaseObjects/dbStudentBenchmarkRow.cs b/api/src/DataAccess/Models/DatabaseObjects/dbStudentBenchmarkRow.cs
index fc95bf8..5860aa2 100644
--- a/api/src/DataAccess/Models/DatabaseObjects/dbStudentBenchmarkRow.cs
+++ b/api/src/DataAccess/Models/DatabaseObjects/dbStudentBenchmarkRow.cs
@@ -5,7 +5,7 @@ public class dbStudentBenchmarkRow
     public string? StudentIdentifier { get; set; }
     public required Guid BenchmarkId { get; set; }
     public required Guid GoalId { get; set; }
-    public string? GoalTitle { get; set; }
+    public string? GoalCategory { get; set; }
     public string? Benchmark { get; set; }
     public string? CreatedByName { get; set; }
     public DateTime CreatedAt { get; set; }
diff --git a/api/src/DataAccess/Models/DatabaseObjects/dbStudentGoalRow.cs b/api/src/DataAccess/Models/DatabaseObjects/dbStudentGoalRow.cs
index d660976..cb8cfd5 100644
--- a/api/src/DataAccess/Models/DatabaseObjects/dbStudentGoalRow.cs
+++ b/api/src/DataAccess/Models/DatabaseObjects/dbStudentGoalRow.cs
@@ -5,9 +5,9 @@ public class dbStudentGoalRow
     public string? StudentIdentifier { get; set; }
     public required Guid GoalId { get; set; }
     public Guid? GoalParentId { get; set; }
-    public string? Title { get; set; }
     public string? Description { get; set; }
     public string? Category { get; set; }
+    public string? Baseline { get; set; }
     public int ProgressEventCount { get; set; }
     public int BenchmarkCount { get; set; }
 }
diff --git a/api/src/DataAccess/Repositories/StudentRepository.cs b/api/src/DataAccess/Repositories/StudentRepository.cs
index e440017..a5043b1 100644
--- a/api/src/DataAccess/Repositories/StudentRepository.cs
+++ b/api/src/DataAccess/Repositories/StudentRepository.cs
@@ -144,9 +144,9 @@ public class StudentRepository
                 p_id_goal_parent = dto.GoalParentId?.ToString(),
                 p_id_student = idStudent.ToString(),
                 p_id_user_created = userId.ToString(),
-                p_title = dto.Title,
                 p_description = dto.Description,
-                p_category = dto.Category
+                p_category = dto.Category,
+                p_baseline = dto.Baseline
             },
             commandType: CommandType.StoredProcedure);
 
@@ -156,9 +156,9 @@ public class StudentRepository
         {
             GoalId = newGoalId,
             GoalParentId = dto.GoalParentId,
-            Title = dto.Title,
             Description = dto.Description,
             Category = dto.Category,
+            Baseline = dto.Baseline,
             ProgressEventCount = 0
         };
     }
@@ -191,9 +191,9 @@ public class StudentRepository
             {
                 GoalId = r.GoalId,
                 GoalParentId = r.GoalParentId,
-                Title = r.Title,
                 Description = r.Description,
                 Category = r.Category,
+                Baseline = r.Baseline,
                 ProgressEventCount = r.ProgressEventCount,
                 BenchmarkCount = r.BenchmarkCount
             }).ToList()
@@ -201,7 +201,7 @@ public class StudentRepository
     }
 
     // *****************************************************************
-    // Updates a goal's title, description, and category.
+    // Updates a goal's description, category, and baseline.
     // *****************************************************************
     public async Task<bool> UpdateGoalAsync(Guid goalId, UpdateGoalDto dto)
     {
@@ -214,9 +214,9 @@ public class StudentRepository
                 p_id_goal_parent = (string?)null,
                 p_id_student = (string?)null,
                 p_id_user_created = (string?)null,
-                p_title = dto.Title,
                 p_description = dto.Description,
-                p_category = dto.Category
+                p_category = dto.Category,
+                p_baseline = dto.Baseline
             },
             commandType: CommandType.StoredProcedure);
         return rowsAffected > 0;
@@ -254,7 +254,7 @@ public class StudentRepository
             {
                 BenchmarkId = r.BenchmarkId,
                 GoalId = r.GoalId,
-                GoalTitle = r.GoalTitle,
+                GoalCategory = r.GoalCategory,
                 Benchmark = r.Benchmark,
                 CreatedByName = r.CreatedByName,
                 CreatedAt = r.CreatedAt,
diff --git a/api/src/DataAccess/Repositories/UserRepository.cs b/api/src/DataAccess/Repositories/UserRepository.cs
index 0ae96f2..ce210be 100644
--- a/api/src/DataAccess/Repositories/UserRepository.cs
+++ b/api/src/DataAccess/Repositories/UserRepository.cs
@@ -43,4 +43,23 @@ public class UserRepository
             new { p_id_user = idUser.ToString() },
             commandType: CommandType.StoredProcedure);
     }
+
+    // *****************************************************************
+    // Updates the password hash and salt for the given user.
+    // Returns true if the user was found and updated.
+    // *****************************************************************
+    public async Task<bool> SetPasswordAsync(Guid userId, string passwordHash, string passwordSalt)
+    {
+        using var db = Connection;
+        var rowsAffected = await db.QuerySingleOrDefaultAsync<int>(
+            "sp_User_SetPassword",
+            new
+            {
+                p_id_user = userId.ToString(),
+                p_password_hash = passwordHash,
+                p_password_salt = passwordSalt
+            },
+            commandType: CommandType.StoredProcedure);
+        return rowsAffected > 0;
+    }
 }
diff --git a/api/src/Models/ResponseTypes/StudentBenchmarkItem.cs b/api/src/Models/ResponseTypes/StudentBenchmarkItem.cs
index b1ab69e..c6cc3b9 100644
--- a/api/src/Models/ResponseTypes/StudentBenchmarkItem.cs
+++ b/api/src/Models/ResponseTypes/StudentBenchmarkItem.cs
@@ -4,7 +4,7 @@ public class StudentBenchmarkItem
 {
     public Guid BenchmarkId { get; set; }
     public Guid GoalId { get; set; }
-    public string? GoalTitle { get; set; }
+    public string? GoalCategory { get; set; }
     public string? Benchmark { get; set; }
     public string? CreatedByName { get; set; }
     public DateTime CreatedAt { get; set; }
diff --git a/api/src/Models/ResponseTypes/StudentGoalItem.cs b/api/src/Models/ResponseTypes/StudentGoalItem.cs
index 6e39936..26acab4 100644
--- a/api/src/Models/ResponseTypes/StudentGoalItem.cs
+++ b/api/src/Models/ResponseTypes/StudentGoalItem.cs
@@ -4,9 +4,9 @@ public class StudentGoalItem
 {
     public Guid GoalId { get; set; }
     public Guid? GoalParentId { get; set; }
-    public string? Title { get; set; }
     public string? Description { get; set; }
     public string? Category { get; set; }
+    public string? Baseline { get; set; }
     public int ProgressEventCount { get; set; }
     public int BenchmarkCount { get; set; }
 }
diff --git a/db/Objects/procedures/sp_Benchmark_GetByStudentId.sql b/db/Objects/procedures/sp_Benchmark_GetByStudentId.sql
index 0ff1ce2..222266b 100644
--- a/db/Objects/procedures/sp_Benchmark_GetByStudentId.sql
+++ b/db/Objects/procedures/sp_Benchmark_GetByStudentId.sql
@@ -5,7 +5,7 @@ BEGIN
         s.`identifier`          AS `studentIdentifier`,
         b.`id_benchmark`        AS `benchmarkId`,
         b.`id_goal`             AS `goalId`,
-        g.`title`               AS `goalTitle`,
+        g.`category`            AS `goalCategory`,
         b.`benchmark`           AS `benchmark`,
         u.`name`                AS `createdByName`,
         b.`created_at`          AS `createdAt`,
diff --git a/db/Objects/procedures/sp_Goal_GetAll.sql b/db/Objects/procedures/sp_Goal_GetAll.sql
index 357163d..04f2ba3 100644
--- a/db/Objects/procedures/sp_Goal_GetAll.sql
+++ b/db/Objects/procedures/sp_Goal_GetAll.sql
@@ -5,9 +5,9 @@ BEGIN
         goalId,
         goalParentId,
         studentId,
-        title,
         description,
         category,
+        baseline,
         progressEventCount
     FROM v_goal_card
     ORDER BY goalId;
diff --git a/db/Objects/procedures/sp_Goal_GetById.sql b/db/Objects/procedures/sp_Goal_GetById.sql
index 1eaae5d..362c2ff 100644
--- a/db/Objects/procedures/sp_Goal_GetById.sql
+++ b/db/Objects/procedures/sp_Goal_GetById.sql
@@ -5,9 +5,9 @@ BEGIN
         goalId,
         goalParentId,
         studentId,
-        title,
         description,
         category,
+        baseline,
         progressEventCount
     FROM v_goal_card
     WHERE goalId = p_id_goal
diff --git a/db/Objects/procedures/sp_Goal_GetByStudentId.sql b/db/Objects/procedures/sp_Goal_GetByStudentId.sql
index 13b9132..3428425 100644
--- a/db/Objects/procedures/sp_Goal_GetByStudentId.sql
+++ b/db/Objects/procedures/sp_Goal_GetByStudentId.sql
@@ -5,9 +5,9 @@ BEGIN
         s.`identifier`          AS `studentIdentifier`,
         vc.`goalId`,
         vc.`goalParentId`,
-        vc.`title`,
         vc.`description`,
         vc.`category`,
+        vc.`baseline`,
         vc.`progressEventCount`,
         vc.`benchmarkCount`
     FROM `v_goal_card` vc
diff --git a/db/Objects/procedures/sp_Goal_Insert.sql b/db/Objects/procedures/sp_Goal_Insert.sql
index f7638de..092c1c4 100644
--- a/db/Objects/procedures/sp_Goal_Insert.sql
+++ b/db/Objects/procedures/sp_Goal_Insert.sql
@@ -4,9 +4,9 @@ CREATE DEFINER=`root`@`%` PROCEDURE `sp_Goal_Insert`(
     IN p_id_goal_parent CHAR(36),
     IN p_id_student CHAR(36),
     IN p_id_user_created CHAR(36),
-    IN p_title VARCHAR(255),
     IN p_description TEXT,
-    IN p_category VARCHAR(100)
+    IN p_category VARCHAR(255),
+    IN p_baseline TEXT
 )
 BEGIN
     INSERT INTO goal
@@ -15,9 +15,9 @@ BEGIN
         id_goal_parent,
         id_student,
         id_user_created,
-        title,
         description,
         category,
+        baseline,
         created_at,
         updated_at
     )
@@ -27,9 +27,9 @@ BEGIN
         p_id_goal_parent,
         p_id_student,
         p_id_user_created,
-        p_title,
         p_description,
         p_category,
+        p_baseline,
         UTC_TIMESTAMP(),
         UTC_TIMESTAMP()
     );
@@ -38,9 +38,9 @@ BEGIN
         id_goal_parent,
         id_student,
         id_user_created,
-        title,
         description,
         category,
+        baseline,
         created_at,
         updated_at
     FROM goal
diff --git a/db/Objects/procedures/sp_Goal_Update.sql b/db/Objects/procedures/sp_Goal_Update.sql
index c08da01..7825217 100644
--- a/db/Objects/procedures/sp_Goal_Update.sql
+++ b/db/Objects/procedures/sp_Goal_Update.sql
@@ -4,9 +4,9 @@ CREATE DEFINER=`root`@`%` PROCEDURE `sp_Goal_Update`(
     IN p_id_goal_parent CHAR(36),
     IN p_id_student CHAR(36),
     IN p_id_user_created CHAR(36),
-    IN p_title VARCHAR(255),
     IN p_description TEXT,
-    IN p_category VARCHAR(100)
+    IN p_category VARCHAR(255),
+    IN p_baseline TEXT
 )
 BEGIN
     UPDATE goal
@@ -14,9 +14,9 @@ BEGIN
         id_goal_parent = COALESCE(p_id_goal_parent, id_goal_parent),
         id_student = COALESCE(p_id_student, id_student),
         id_user_created = COALESCE(p_id_user_created, id_user_created),
-        title = COALESCE(p_title, title),
         description = COALESCE(p_description, description),
         category = COALESCE(p_category, category),
+        baseline = COALESCE(p_baseline, baseline),
         updated_at = UTC_TIMESTAMP()
     WHERE id_goal = p_id_goal;
     SELECT ROW_COUNT() AS rows_affected;
diff --git a/db/Objects/procedures/sp_User_SetPassword.sql b/db/Objects/procedures/sp_User_SetPassword.sql
new file mode 100644
index 0000000..8d1991c
--- /dev/null
+++ b/db/Objects/procedures/sp_User_SetPassword.sql
@@ -0,0 +1,15 @@
+DELIMITER ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `sp_User_SetPassword`(
+    IN p_id_user CHAR(36),
+    IN p_password_hash VARCHAR(255),
+    IN p_password_salt VARCHAR(255)
+)
+BEGIN
+    UPDATE user
+    SET password_hash = p_password_hash,
+        password_salt = p_password_salt,
+        password_updated_at = UTC_TIMESTAMP()
+    WHERE id_user = p_id_user;
+    SELECT ROW_COUNT() AS rows_affected;
+END;;
+DELIMITER ;
diff --git a/db/Objects/tables/goal.sql b/db/Objects/tables/goal.sql
index 7fa149a..9f8c3e5 100644
--- a/db/Objects/tables/goal.sql
+++ b/db/Objects/tables/goal.sql
@@ -3,9 +3,9 @@ CREATE TABLE `goal` (
   `id_goal_parent` char(36) DEFAULT NULL,
   `id_student` char(36) DEFAULT NULL,
   `id_user_created` char(36) DEFAULT NULL,
-  `title` varchar(255) DEFAULT NULL,
   `description` text,
-  `category` varchar(100) DEFAULT NULL,
+  `category` varchar(255) DEFAULT NULL,
+  `baseline` text,
   `created_at` timestamp NULL DEFAULT NULL,
   `updated_at` timestamp NULL DEFAULT NULL,
   PRIMARY KEY (`id_goal`),
diff --git a/db/Objects/views/v_goal_card.sql b/db/Objects/views/v_goal_card.sql
index a935665..7835cac 100644
--- a/db/Objects/views/v_goal_card.sql
+++ b/db/Objects/views/v_goal_card.sql
@@ -1,7 +1,7 @@
 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`%` SQL SECURITY DEFINER VIEW `winstudentgoaltracker`.`v_goal_card` AS
-select `g`.`id_goal` AS `goalId`,`g`.`id_goal_parent` AS `goalParentId`,`g`.`id_student` AS `studentId`,`g`.`title` AS `title`,`g`.`description` AS `description`,`g`.`category` AS `category`,count(distinct `pe`.`id_progress_event`) AS `progressEventCount`,count(distinct `b`.`id_benchmark`) AS `benchmarkCount`
+select `g`.`id_goal` AS `goalId`,`g`.`id_goal_parent` AS `goalParentId`,`g`.`id_student` AS `studentId`,`g`.`description` AS `description`,`g`.`category` AS `category`,`g`.`baseline` AS `baseline`,count(distinct `pe`.`id_progress_event`) AS `progressEventCount`,count(distinct `b`.`id_benchmark`) AS `benchmarkCount`
 from ((`winstudentgoaltracker`.`goal` `g`
 left
 join `winstudentgoaltracker`.`progress_event` `pe` on((`pe`.`id_goal` = `g`.`id_goal`)))
 left
-join `winstudentgoaltracker`.`benchmark` `b` on((`b`.`id_goal` = `g`.`id_goal`))) group by `g`.`id_goal`,`g`.`id_goal_parent`,`g`.`id_student`,`g`.`title`,`g`.`description`,`g`.`category`;
+join `winstudentgoaltracker`.`benchmark` `b` on((`b`.`id_goal` = `g`.`id_goal`))) group by `g`.`id_goal`,`g`.`id_goal_parent`,`g`.`id_student`,`g`.`description`,`g`.`category`,`g`.`baseline`;
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/add-goal-modal/add-goal-modal.html b/ui/winstudentgoaltracker/src/app/desktop/components/add-goal-modal/add-goal-modal.html
index 22b4906..a071034 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/add-goal-modal/add-goal-modal.html
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/add-goal-modal/add-goal-modal.html
@@ -8,18 +8,6 @@
 
     <form class="modal-body" (ngSubmit)="onSubmit()" #goalForm="ngForm">
 
-        <div class="field">
-            <label for="title">Title<span class="required">*</span></label>
-            <input
-                id="title"
-                type="text"
-                [(ngModel)]="form.title"
-                name="title"
-                required
-                placeholder="e.g. Improve reading comprehension"
-            />
-        </div>
-
         <div class="field">
             <label for="category">Category<span class="required">*</span></label>
             <input
@@ -32,18 +20,6 @@
             />
         </div>
 
-        @if (parentGoalOptions().length > 0) {
-            <div class="field">
-                <label for="goalParentId">Parent Goal <span class="optional">(optional)</span></label>
-                <select id="goalParentId" [(ngModel)]="form.goalParentId" name="goalParentId">
-                    <option [ngValue]="null">None</option>
-                    @for (goal of parentGoalOptions(); track goal.goalId) {
-                        <option [ngValue]="goal.goalId">{{ goal.title }}</option>
-                    }
-                </select>
-            </div>
-        }
-
         <div class="field">
             <label for="description">Description</label>
             <textarea
@@ -55,6 +31,29 @@
             ></textarea>
         </div>
 
+        <div class="field">
+            <label for="baseline">Baseline</label>
+            <textarea
+                id="baseline"
+                [(ngModel)]="form.baseline"
+                name="baseline"
+                rows="3"
+                placeholder="Enter baseline..."
+            ></textarea>
+        </div>
+
+        @if (parentGoalOptions().length > 0) {
+            <div class="field">
+                <label for="goalParentId">Parent Goal <span class="optional">(optional)</span></label>
+                <select id="goalParentId" [(ngModel)]="form.goalParentId" name="goalParentId">
+                    <option [ngValue]="null">None</option>
+                    @for (goal of parentGoalOptions(); track goal.goalId) {
+                        <option [ngValue]="goal.goalId">{{ goal.category }}</option>
+                    }
+                </select>
+            </div>
+        }
+
         @if (errorMessage()) {
             <p class="error">{{ errorMessage() }}</p>
         }
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/add-goal-modal/add-goal-modal.ts b/ui/winstudentgoaltracker/src/app/desktop/components/add-goal-modal/add-goal-modal.ts
index 0dffcc7..36e7746 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/add-goal-modal/add-goal-modal.ts
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/add-goal-modal/add-goal-modal.ts
@@ -31,9 +31,9 @@ export class AddGoalModal {
     );
 
     protected form: CreateGoalDto = {
-        title: '',
         description: '',
         category: '',
+        baseline: '',
         goalParentId: null,
     };
 
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/add-student-modal/add-student-modal.html b/ui/winstudentgoaltracker/src/app/desktop/components/add-student-modal/add-student-modal.html
index cd3a03b..6bc143b 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/add-student-modal/add-student-modal.html
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/add-student-modal/add-student-modal.html
@@ -9,14 +9,14 @@
     <form class="modal-body" (ngSubmit)="onSubmit()" #studentForm="ngForm">
 
         <div class="field">
-            <label for="identifier">Identifier</label>
+            <label for="identifier">Student</label>
             <input
                 id="identifier"
                 type="text"
                 [(ngModel)]="form.identifier"
                 name="identifier"
                 required
-                placeholder="e.g. Student123"
+                placeholder="Initials or other non-personally identifiable label"
             />
         </div>
 
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-card-full/benchmark-card-full.html b/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-card-full/benchmark-card-full.html
index 3cd0d3f..a69376e 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-card-full/benchmark-card-full.html
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-card-full/benchmark-card-full.html
@@ -16,7 +16,7 @@
 <div class="detail-card">
     <div class="field">
         <span class="field-label">Goal</span>
-        <span class="field-value">{{ goalTitle }}</span>
+        <span class="field-value">{{ goalCategory }}</span>
     </div>
     <div class="field">
         <label class="field-label" for="benchmarkText">Benchmark</label>
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-card-full/benchmark-card-full.ts b/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-card-full/benchmark-card-full.ts
index 5328476..5b1a8e6 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-card-full/benchmark-card-full.ts
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-card-full/benchmark-card-full.ts
@@ -47,7 +47,7 @@ export class BenchmarkCardFull implements OnDestroy {
   private savedBenchmarkText = '';
 
   // Read-only metadata
-  protected goalTitle = '';
+  protected goalCategory = '';
   protected createdByName = '';
   protected createdAt: Date | null = null;
   protected updatedAt: Date | null = null;
@@ -127,7 +127,7 @@ export class BenchmarkCardFull implements OnDestroy {
       this.isNew.set(true);
       this.benchmarkText = '';
       this.savedBenchmarkText = '';
-      this.loadGoalTitle();
+      this.loadGoalCategory();
       this.loaded.set(true);
       return;
     }
@@ -147,7 +147,7 @@ export class BenchmarkCardFull implements OnDestroy {
 
       this.benchmarkText = bm.benchmark;
       this.savedBenchmarkText = bm.benchmark;
-      this.goalTitle = bm.goalTitle;
+      this.goalCategory = bm.goalCategory;
       this.createdByName = bm.createdByName;
       this.createdAt = bm.createdAt;
       this.updatedAt = bm.updatedAt;
@@ -156,13 +156,13 @@ export class BenchmarkCardFull implements OnDestroy {
   }
 
   // *****************************************************************
-  // Loads the goal title for a new benchmark.
+  // Loads the goal category for a new benchmark.
   // *****************************************************************
-  private loadGoalTitle() {
+  private loadGoalCategory() {
     this.studentService.getGoalsForStudent(this.studentId).then(result => {
       if (result.success && result.payload) {
         const goal = result.payload.goals.find(g => g.goalId === this.goalId);
-        this.goalTitle = goal?.title ?? '';
+        this.goalCategory = goal?.category ?? '';
       }
     });
   }
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-card/benchmark-card.html b/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-card/benchmark-card.html
index fa8a4f6..4b9f0aa 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-card/benchmark-card.html
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-card/benchmark-card.html
@@ -1,6 +1,6 @@
 <div class="card">
     <div class="card-header">
-        <span class="goal-badge">{{ benchmark().goalTitle }}</span>
+        <span class="goal-badge">{{ benchmark().goalCategory }}</span>
         @if (benchmark().updatedAt) {
         <span class="date">Updated: {{ benchmark().updatedAt | date:'M/d/yy' }}</span>
         } @else {
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-list/benchmark-list.html b/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-list/benchmark-list.html
index dae1868..f82402b 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-list/benchmark-list.html
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-list/benchmark-list.html
@@ -4,8 +4,10 @@
     <button class="toolbar-btn" (click)="onAddBenchmark()">+ Add a Benchmark</button>
 </div>
 
-@if (studentIdentifier()) {
-<h2 class="section-header">Benchmarks for {{ studentIdentifier() }}</h2>
+@if (goalCategory()) {
+<h2 class="section-header">Benchmarks for {{ goalCategory() }}</h2>
+} @else {
+<h2 class="section-header">Benchmarks</h2>
 }
 
 @if (errorMessage()) {
@@ -13,8 +15,11 @@
 }
 
 @if (benchmarks().length === 0 && !errorMessage()) {
-<p class="empty-state">No benchmarks yet. Click <a class="empty-link" (click)="onAddBenchmark()">Add a Benchmark</a> to
-    get started.</p>
+<div class="empty-state">
+    <p>Benchmarks are milestones on the way to achieving a goal. They are optional in this system.</p>
+    <p>No benchmarks yet.</p>
+    <p>Click <strong>+ Add a Benchmark</strong> in the upper right to get started.</p>
+</div>
 } @else {
 <div class="card-grid">
     @for (bm of benchmarks(); track bm.benchmarkId) {
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-list/benchmark-list.scss b/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-list/benchmark-list.scss
index c5a6379..1a518dd 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-list/benchmark-list.scss
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-list/benchmark-list.scss
@@ -54,16 +54,13 @@
 }
 
 .empty-state {
-    color: #888;
-    font-size: 0.9375rem;
-    margin: 2rem auto;
     text-align: center;
-}
-
-.empty-link {
-    color: #4f46e5;
-    text-decoration: underline;
-    cursor: pointer;
+    padding: 3rem 1.5rem;
+    color: #555;
+    font-size: 0.9375rem;
+    background: #fff;
+    border-radius: 8px;
+    border: 1px solid #ddd;
 }
 
 .card-grid {
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-list/benchmark-list.ts b/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-list/benchmark-list.ts
index 8dfcb29..e8cccf6 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-list/benchmark-list.ts
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/benchmark-list/benchmark-list.ts
@@ -18,6 +18,7 @@ export class BenchmarkList {
     this.studentId = this.route.snapshot.paramMap.get('studentId')!;
     this.goalId = this.route.snapshot.paramMap.get('goalId') || '';
     this.loadBenchmarks();
+    this.loadGoalCategory();
   }
 
   // ************************** Declarations *************************
@@ -28,7 +29,7 @@ export class BenchmarkList {
 
   protected readonly studentId: string;
   protected readonly goalId: string;
-  protected readonly studentIdentifier = signal<string | null>(null);
+  protected readonly goalCategory = signal<string | null>(null);
   protected readonly benchmarks = signal<BenchmarkDto[]>([]);
   protected readonly errorMessage = signal<string | null>(null);
 
@@ -43,22 +44,51 @@ export class BenchmarkList {
   }
 
   onBack() {
-    this.router.navigate(['/students', this.studentId, 'goals', this.goalId]);
+    if (this.goalId) {
+      this.router.navigate(['/students', this.studentId, 'goals', this.goalId]);
+    } else {
+      this.router.navigate(['/students', this.studentId, 'goals']);
+    }
   }
 
   // ********************** Support Procedures ***********************
 
   // *****************************************************************
-  // Loads benchmarks for the student from the service.
+  // Loads benchmarks for the student from the service. Also sets
+  // goalCategory from the first benchmark's data.
   // *****************************************************************
   private loadBenchmarks() {
     this.studentService.getBenchmarksForStudent(this.studentId).then(data => {
       if (!data.success) {
         this.errorMessage.set(data.message);
       } else {
-        this.studentIdentifier.set(data.payload?.studentIdentifier ?? null);
-        this.benchmarks.set(data.payload?.benchmarks ?? []);
+        const benchmarks = data.payload?.benchmarks ?? [];
+        this.benchmarks.set(benchmarks);
+
+        // Set the goal category from benchmark data if available
+        if (this.goalId && benchmarks.length > 0) {
+          const match = benchmarks.find(b => b.goalId === this.goalId);
+          if (match) this.goalCategory.set(match.goalCategory);
+        }
+
+        // If we still don't have a category, load it from the goals API
+        if (!this.goalCategory()) {
+          this.loadGoalCategory();
+        }
       }
     });
   }
+
+  // *****************************************************************
+  // Loads the goal category from the goals API as a fallback when
+  // no benchmarks exist yet to extract it from.
+  // *****************************************************************
+  private loadGoalCategory() {
+    if (!this.goalId) return;
+    this.studentService.getGoalsForStudent(this.studentId).then(result => {
+      if (!result.success || !result.payload) return;
+      const goal = result.payload.goals.find(g => g.goalId === this.goalId);
+      this.goalCategory.set(goal?.category ?? null);
+    });
+  }
 }
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/goal-card-full/goal-card-full.html b/ui/winstudentgoaltracker/src/app/desktop/components/goal-card-full/goal-card-full.html
index 6f24319..559646e 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/goal-card-full/goal-card-full.html
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/goal-card-full/goal-card-full.html
@@ -1,5 +1,5 @@
 <div class="toolbar">
-    <button class="toolbar-btn back-btn" (click)="onBack()">&#8593; Student</button>
+    <button class="toolbar-btn back-btn" (click)="onBack()">&#8593; Goals</button>
     <span class="toolbar-title">Goal Detail</span>
     <span class="spacer"></span>
 </div>
@@ -15,8 +15,8 @@
 @if (loaded()) {
 <div class="detail-card">
     <div class="field">
-        <label class="field-label" for="title">Title</label>
-        <input id="title" class="field-input" type="text" [(ngModel)]="title" />
+        <label class="field-label" for="baseline">Baseline</label>
+        <input id="baseline" class="field-input" type="text" [(ngModel)]="baseline" />
     </div>
     <div class="field">
         <label class="field-label" for="description">Description</label>
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/goal-card-full/goal-card-full.ts b/ui/winstudentgoaltracker/src/app/desktop/components/goal-card-full/goal-card-full.ts
index 8bb14bd..51c09ac 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/goal-card-full/goal-card-full.ts
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/goal-card-full/goal-card-full.ts
@@ -39,18 +39,18 @@ export class GoalCardFull implements OnDestroy {
   protected readonly saving = signal(false);
 
   // Form fields
-  protected title = '';
   protected description = '';
   protected category = '';
+  protected baseline = '';
 
   // Read-only metadata
   protected progressEventCount = 0;
   protected benchmarkCount = 0;
 
   // Snapshot
-  private savedTitle = '';
   private savedDescription = '';
   private savedCategory = '';
+  private savedBaseline = '';
 
   // ************************** Properties ***************************
 
@@ -58,9 +58,9 @@ export class GoalCardFull implements OnDestroy {
   // Returns true if form values differ from the saved snapshot.
   // *****************************************************************
   hasChanges(): boolean {
-    return this.title !== this.savedTitle
-      || this.description !== this.savedDescription
-      || this.category !== this.savedCategory;
+    return this.description !== this.savedDescription
+      || this.category !== this.savedCategory
+      || this.baseline !== this.savedBaseline;
   }
 
   // ************************ Public Methods *************************
@@ -76,17 +76,17 @@ export class GoalCardFull implements OnDestroy {
     this.successMessage.set(null);
 
     const result = await this.studentService.updateGoal(this.studentId, this.goalId, {
-      title: this.title,
       description: this.description,
       category: this.category,
+      baseline: this.baseline,
     });
 
     this.saving.set(false);
 
     if (result.success) {
-      this.savedTitle = this.title;
       this.savedDescription = this.description;
       this.savedCategory = this.category;
+      this.savedBaseline = this.baseline;
       this.successMessage.set('Changes saved.');
     } else {
       this.errorMessage.set(result.message);
@@ -97,15 +97,15 @@ export class GoalCardFull implements OnDestroy {
   // Reverts form fields to the last-saved snapshot.
   // *****************************************************************
   onCancel() {
-    this.title = this.savedTitle;
     this.description = this.savedDescription;
     this.category = this.savedCategory;
+    this.baseline = this.savedBaseline;
     this.errorMessage.set(null);
     this.successMessage.set(null);
   }
 
   onBack() {
-    this.router.navigate(['/students', this.studentId]);
+    this.router.navigate(['/students', this.studentId, 'goals']);
   }
 
   onProgressEvents() {
@@ -139,15 +139,15 @@ export class GoalCardFull implements OnDestroy {
         return;
       }
 
-      this.title = goal.title;
       this.description = goal.description;
       this.category = goal.category;
+      this.baseline = goal.baseline;
       this.progressEventCount = goal.progressEventCount;
       this.benchmarkCount = goal.benchmarkCount;
 
-      this.savedTitle = goal.title;
       this.savedDescription = goal.description;
       this.savedCategory = goal.category;
+      this.savedBaseline = goal.baseline;
       this.loaded.set(true);
     });
   }
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/goal-card/goal-card.html b/ui/winstudentgoaltracker/src/app/desktop/components/goal-card/goal-card.html
index 3a1ddf6..086a307 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/goal-card/goal-card.html
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/goal-card/goal-card.html
@@ -4,7 +4,7 @@
         <span class="event-count">{{ goal().progressEventCount }} events</span>
     </div>
 
-    <h3 class="title">{{ goal().title }}</h3>
+    <h3 class="title">{{ goal().category }}</h3>
     <p class="description">{{ goal().description }}</p>
 
     <div class="card-footer">
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/goal-card/goal-card.scss b/ui/winstudentgoaltracker/src/app/desktop/components/goal-card/goal-card.scss
index 42b66ef..2b9ff1f 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/goal-card/goal-card.scss
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/goal-card/goal-card.scss
@@ -1,6 +1,6 @@
 :host {
     display: block;
-    width: 300px;
+    width: 450px;
 }
 
 .card {
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/goal-list/goal-list.html b/ui/winstudentgoaltracker/src/app/desktop/components/goal-list/goal-list.html
index 45d5c09..4651b68 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/goal-list/goal-list.html
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/goal-list/goal-list.html
@@ -22,7 +22,10 @@
 }
 
 @if (goals().length === 0 && !errorMessage()) {
-<p class="empty-state">No goals yet. Click <strong>+ Add a Goal</strong> to get started.</p>
+<div class="empty-state">
+    <p>No goals yet.</p>
+    <p>Click <strong>+ Add a Goal</strong> in the upper right to get started.</p>
+</div>
 } @else {
 <div class="card-grid">
     @for (goal of goals(); track goal.goalId) {
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/goal-list/goal-list.scss b/ui/winstudentgoaltracker/src/app/desktop/components/goal-list/goal-list.scss
index d23df06..0cb53b3 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/goal-list/goal-list.scss
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/goal-list/goal-list.scss
@@ -66,10 +66,13 @@
 }
 
 .empty-state {
-    color: #888;
-    font-size: 0.9375rem;
-    margin: 2rem auto;
     text-align: center;
+    padding: 3rem 1.5rem;
+    color: #555;
+    font-size: 0.9375rem;
+    background: #fff;
+    border-radius: 8px;
+    border: 1px solid #ddd;
 }
 
 .card-grid {
@@ -88,4 +91,5 @@
     background: #fff;
     border-top: 1px solid #ddd;
     flex-shrink: 0;
+    margin-top: auto;
 }
\ No newline at end of file
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/goal-list/goal-list.ts b/ui/winstudentgoaltracker/src/app/desktop/components/goal-list/goal-list.ts
index 8ffd288..027d533 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/goal-list/goal-list.ts
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/goal-list/goal-list.ts
@@ -49,6 +49,7 @@ export class GoalList implements OnDestroy {
     onGoalCreated(goal: StudentGoalItem) {
         this.goals.update(list => [...list, goal]);
         this.showAddModal.set(false);
+        this.studentService.notifyDataChanged();
     }
 
     onModalCancelled() {
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/progress-list/progress-list.html b/ui/winstudentgoaltracker/src/app/desktop/components/progress-list/progress-list.html
index b89f1e9..d390b0a 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/progress-list/progress-list.html
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/progress-list/progress-list.html
@@ -7,10 +7,10 @@
 
 <!-- <img class="hero-image" src="/slalomcropped.png" alt="Slalom" /> -->
 
-@if (studentIdentifier() && goalTitle()) {
+@if (studentIdentifier() && goalCategory()) {
 <div class="header-row">
     <h2 class="section-header">
-        Student: {{ studentIdentifier() }} &nbsp;&nbsp; Goal: {{ goalTitle() }}
+        Student: {{ studentIdentifier() }} &nbsp;&nbsp; Goal: {{ goalCategory() }}
         @if (isFiltered()) {
         <span class="filter-count">(showing {{ filteredEvents().length }} of {{ events().length }})</span>
         }
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/progress-list/progress-list.ts b/ui/winstudentgoaltracker/src/app/desktop/components/progress-list/progress-list.ts
index 644c110..0435b5f 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/progress-list/progress-list.ts
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/progress-list/progress-list.ts
@@ -20,7 +20,7 @@ export class ProgressList implements OnDestroy {
     this.studentId = this.route.snapshot.paramMap.get('studentId')!;
     this.goalId = this.route.snapshot.paramMap.get('goalId')!;
     this.loadEvents();
-    this.loadGoalTitle();
+    this.loadGoalCategory();
 
     this.searchInput$.pipe(debounceTime(300)).subscribe(term => {
       this.searchTerm.set(term);
@@ -38,7 +38,7 @@ export class ProgressList implements OnDestroy {
   private readonly searchInput$ = new Subject<string>();
 
   protected readonly studentIdentifier = signal<string | null>(null);
-  protected readonly goalTitle = signal<string | null>(null);
+  protected readonly goalCategory = signal<string | null>(null);
   protected readonly events = signal<ProgressEventDto[]>([]);
   protected readonly errorMessage = signal<string | null>(null);
   protected readonly rawSearchText = signal('');
@@ -118,16 +118,15 @@ export class ProgressList implements OnDestroy {
   }
 
   // *****************************************************************
-  // Loads the goal title from the student's goal list so the heading
-  // can display "Progress for <goal title>".
+  // Loads the goal category from the student's goal list so the heading
+  // can display "Progress for <goal category>".
   // *****************************************************************
-  private loadGoalTitle() {
+  private loadGoalCategory() {
     this.studentService.getGoalsForStudent(this.studentId).then(result => {
-      if (result.success && result.payload) {
-        this.studentIdentifier.set(result.payload.studentIdentifier);
-        const goal = result.payload.goals.find(g => g.goalId === this.goalId);
-        this.goalTitle.set(goal?.title ?? null);
-      }
+      if (!result.success || !result.payload) return;
+      this.studentIdentifier.set(result.payload.studentIdentifier);
+      const goal = result.payload.goals.find(g => g.goalId === this.goalId);
+      this.goalCategory.set(goal?.category ?? null);
     });
   }
 }
diff --git a/ui/winstudentgoaltracker/src/app/desktop/components/student-card-list/student-card-list.ts b/ui/winstudentgoaltracker/src/app/desktop/components/student-card-list/student-card-list.ts
index c012e7c..3461932 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/components/student-card-list/student-card-list.ts
+++ b/ui/winstudentgoaltracker/src/app/desktop/components/student-card-list/student-card-list.ts
@@ -44,6 +44,7 @@ export class StudentCardList {
   onStudentCreated(student: StudentCardDto) {
     this.students.update(list => this.sortByIdentifier([...list, student]));
     this.showAddModal.set(false);
+    this.studentService.notifyDataChanged();
   }
 
   onModalCancelled() {
diff --git a/ui/winstudentgoaltracker/src/app/desktop/pages/home/home.scss b/ui/winstudentgoaltracker/src/app/desktop/pages/home/home.scss
index 23b8e68..96bb09a 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/pages/home/home.scss
+++ b/ui/winstudentgoaltracker/src/app/desktop/pages/home/home.scss
@@ -106,6 +106,8 @@
     overflow-y: auto;
     padding: 1.5rem;
     background: #f5f5f5;
+    display: flex;
+    flex-direction: column;
 }
 
 /* Footer */
diff --git a/ui/winstudentgoaltracker/src/app/desktop/pages/home/home.ts b/ui/winstudentgoaltracker/src/app/desktop/pages/home/home.ts
index ad82dbb..1a87ce3 100644
--- a/ui/winstudentgoaltracker/src/app/desktop/pages/home/home.ts
+++ b/ui/winstudentgoaltracker/src/app/desktop/pages/home/home.ts
@@ -120,7 +120,7 @@ export class Home implements OnDestroy {
     if (!result.success || !result.payload) return [];
 
     return result.payload.goals.map(goal => ({
-      label: goal.title,
+      label: goal.category,
       routerLink: ['/students', studentId, 'goals', goal.goalId],
       childCount: 2,
       children: [
diff --git a/ui/winstudentgoaltracker/src/app/mobile/pages/add-progress-event/add-progress-event.html b/ui/winstudentgoaltracker/src/app/mobile/pages/add-progress-event/add-progress-event.html
index 1ccbb1a..06886bb 100644
--- a/ui/winstudentgoaltracker/src/app/mobile/pages/add-progress-event/add-progress-event.html
+++ b/ui/winstudentgoaltracker/src/app/mobile/pages/add-progress-event/add-progress-event.html
@@ -4,7 +4,7 @@
         <button class="back-btn" (click)="onBack()">← Back</button>
         <span class="student-name">{{ studentIdentifier() }}</span>
     </div>
-    <h2 class="goal-title">{{ goalTitle() }}</h2>
+    <h2 class="goal-title">{{ goalCategory() }}</h2>
 
     <!-- Error message -->
     @if (error()) {
diff --git a/ui/winstudentgoaltracker/src/app/mobile/pages/add-progress-event/add-progress-event.ts b/ui/winstudentgoaltracker/src/app/mobile/pages/add-progress-event/add-progress-event.ts
index 1e46745..824411b 100644
--- a/ui/winstudentgoaltracker/src/app/mobile/pages/add-progress-event/add-progress-event.ts
+++ b/ui/winstudentgoaltracker/src/app/mobile/pages/add-progress-event/add-progress-event.ts
@@ -17,7 +17,7 @@ export class AddProgressEvent {
   // ************************** Constructor **************************
 
   constructor() {
-    this.goalTitle.set(this.route.snapshot.queryParamMap.get('goalTitle') ?? '');
+    this.goalCategory.set(this.route.snapshot.queryParamMap.get('goalCategory') ?? '');
     this.studentIdentifier.set(this.route.snapshot.queryParamMap.get('studentIdentifier') ?? '');
     this.studentId = this.route.snapshot.paramMap.get('studentId') ?? '';
     this.goalId = this.route.snapshot.paramMap.get('goalId') ?? '';
@@ -32,7 +32,7 @@ export class AddProgressEvent {
   private readonly studentId: string;
   private readonly goalId: string;
 
-  protected readonly goalTitle = signal('');
+  protected readonly goalCategory = signal('');
   protected readonly studentIdentifier = signal('');
   protected readonly notes = signal('');
   protected readonly error = signal<string | null>(null);
diff --git a/ui/winstudentgoaltracker/src/app/mobile/pages/student-goals/student-goals.html b/ui/winstudentgoaltracker/src/app/mobile/pages/student-goals/student-goals.html
index 8853f1b..14ed4b9 100644
--- a/ui/winstudentgoaltracker/src/app/mobile/pages/student-goals/student-goals.html
+++ b/ui/winstudentgoaltracker/src/app/mobile/pages/student-goals/student-goals.html
@@ -9,8 +9,8 @@
     <h2 class="section-heading">Goals</h2>
     <div class="goal-cards">
         @for (goal of data()?.goals; track goal.goalId) {
-        <div class="goal-card" (click)="onGoalClick(goal.goalId, goal.title)">
-            <span class="goal-title">{{ goal.title }}</span>
+        <div class="goal-card" (click)="onGoalClick(goal.goalId, goal.category)">
+            <span class="goal-title">{{ goal.category }}</span>
             <span class="event-count">{{ goal.progressEventCount }}</span>
         </div>
         }
diff --git a/ui/winstudentgoaltracker/src/app/mobile/pages/student-goals/student-goals.ts b/ui/winstudentgoaltracker/src/app/mobile/pages/student-goals/student-goals.ts
index bbfa4ae..669a237 100644
--- a/ui/winstudentgoaltracker/src/app/mobile/pages/student-goals/student-goals.ts
+++ b/ui/winstudentgoaltracker/src/app/mobile/pages/student-goals/student-goals.ts
@@ -46,10 +46,10 @@ export class StudentGoals {
   // *****************************************************************
   // Navigates to the add-progress-event page for the selected goal.
   // *****************************************************************
-  onGoalClick(goalId: string, goalTitle: string) {
+  onGoalClick(goalId: string, goalCategory: string) {
     this.router.navigate(
       ['students', this.studentId, 'goals', goalId, 'add-event'],
-      { queryParams: { goalTitle, studentIdentifier: this.data()?.studentIdentifier } },
+      { queryParams: { goalCategory, studentIdentifier: this.data()?.studentIdentifier } },
     );
   }
 
diff --git a/ui/winstudentgoaltracker/src/app/shared/classes/benchmark.dto.ts b/ui/winstudentgoaltracker/src/app/shared/classes/benchmark.dto.ts
index fa69631..e0bd357 100644
--- a/ui/winstudentgoaltracker/src/app/shared/classes/benchmark.dto.ts
+++ b/ui/winstudentgoaltracker/src/app/shared/classes/benchmark.dto.ts
@@ -6,7 +6,7 @@ export interface StudentBenchmarkSummary {
 export interface BenchmarkDto {
     benchmarkId: string;
     goalId: string;
-    goalTitle: string;
+    goalCategory: string;
     benchmark: string;
     createdByName: string;
     createdAt: Date;
diff --git a/ui/winstudentgoaltracker/src/app/shared/classes/create-goal.dto.ts b/ui/winstudentgoaltracker/src/app/shared/classes/create-goal.dto.ts
index 6fb0304..e568540 100644
--- a/ui/winstudentgoaltracker/src/app/shared/classes/create-goal.dto.ts
+++ b/ui/winstudentgoaltracker/src/app/shared/classes/create-goal.dto.ts
@@ -1,6 +1,6 @@
 export interface CreateGoalDto {
-    title: string;
     description: string;
     category: string;
+    baseline: string;
     goalParentId: string | null;
 }
diff --git a/ui/winstudentgoaltracker/src/app/shared/classes/student-goal.ts b/ui/winstudentgoaltracker/src/app/shared/classes/student-goal.ts
index c78b73d..a616ee4 100644
--- a/ui/winstudentgoaltracker/src/app/shared/classes/student-goal.ts
+++ b/ui/winstudentgoaltracker/src/app/shared/classes/student-goal.ts
@@ -6,9 +6,9 @@ export interface StudentGoalSummary {
 export interface StudentGoalItem {
     goalId: string;              // goal.id_goal — char(36)
     goalParentId: string | null;
-    title: string;               // goal.title — varchar(255)
     description: string;         // goal.description — text
     category: string;            // goal.category — varchar(100)
+    baseline: string;            // goal.baseline — text
     progressEventCount: number;  // count of progress_event rows for this goal
     benchmarkCount: number;      // count of benchmark rows for this goal
 }
diff --git a/ui/winstudentgoaltracker/src/app/shared/services/dummy-student.service.ts b/ui/winstudentgoaltracker/src/app/shared/services/dummy-student.service.ts
index 5e9297e..c1e233e 100644
--- a/ui/winstudentgoaltracker/src/app/shared/services/dummy-student.service.ts
+++ b/ui/winstudentgoaltracker/src/app/shared/services/dummy-student.service.ts
@@ -19,41 +19,41 @@ export class DummyStudentService {
         '1': {
             studentIdentifier: 'J.B',
             goals: [
-                { goalId: 'g1', goalParentId: null, title: 'Improve reading comprehension', description: 'Work on main-idea identification and inference skills across fiction and nonfiction texts.', category: 'Academics', progressEventCount: 5, benchmarkCount: 2 },
-                { goalId: 'g2', goalParentId: null, title: 'Complete algebra module', description: 'Finish all units in the algebra course including linear equations and graphing.', category: 'Academics', progressEventCount: 2, benchmarkCount: 0 },
-                { goalId: 'g3', goalParentId: null, title: 'Weekly journal entries', description: 'Write a reflective journal entry each week to build writing fluency.', category: 'Communication', progressEventCount: 8, benchmarkCount: 1 },
+                { goalId: 'g1', goalParentId: null, description: 'Work on main-idea identification and inference skills across fiction and nonfiction texts.', category: 'Academics', baseline: '', progressEventCount: 5, benchmarkCount: 2 },
+                { goalId: 'g2', goalParentId: null, description: 'Finish all units in the algebra course including linear equations and graphing.', category: 'Academics', baseline: '', progressEventCount: 2, benchmarkCount: 0 },
+                { goalId: 'g3', goalParentId: null, description: 'Write a reflective journal entry each week to build writing fluency.', category: 'Communication', baseline: '', progressEventCount: 8, benchmarkCount: 1 },
             ],
         },
         '2': {
             studentIdentifier: 'M.K',
             goals: [
-                { goalId: 'g4', goalParentId: null, title: 'Pass certification exam', description: 'Prepare for and pass the industry certification exam by end of quarter.', category: 'Career Readiness', progressEventCount: 3, benchmarkCount: 0 },
-                { goalId: 'g5', goalParentId: null, title: 'Attendance above 90%', description: 'Maintain consistent attendance throughout the term.', category: 'Behavior', progressEventCount: 0, benchmarkCount: 0 },
-                { goalId: 'g6', goalParentId: null, title: 'Complete internship hours', description: 'Log the required 40 hours at the assigned internship site.', category: 'Career Readiness', progressEventCount: 12, benchmarkCount: 0 },
-                { goalId: 'g7', goalParentId: null, title: 'Portfolio project', description: 'Build a personal portfolio showcasing completed coursework and projects.', category: 'Career Readiness', progressEventCount: 1, benchmarkCount: 0 },
+                { goalId: 'g4', goalParentId: null, description: 'Prepare for and pass the industry certification exam by end of quarter.', category: 'Career Readiness', baseline: '', progressEventCount: 3, benchmarkCount: 0 },
+                { goalId: 'g5', goalParentId: null, description: 'Maintain consistent attendance throughout the term.', category: 'Behavior', baseline: '', progressEventCount: 0, benchmarkCount: 0 },
+                { goalId: 'g6', goalParentId: null, description: 'Log the required 40 hours at the assigned internship site.', category: 'Career Readiness', baseline: '', progressEventCount: 12, benchmarkCount: 0 },
+                { goalId: 'g7', goalParentId: null, description: 'Build a personal portfolio showcasing completed coursework and projects.', category: 'Career Readiness', baseline: '', progressEventCount: 1, benchmarkCount: 0 },
             ],
         },
         '3': {
             studentIdentifier: 'A.R',
             goals: [
-                { goalId: 'g8', goalParentId: null, title: 'GED preparation', description: 'Complete practice tests and study modules for GED math and reading sections.', category: 'Academics', progressEventCount: 6, benchmarkCount: 0 },
-                { goalId: 'g9', goalParentId: null, title: 'Resume workshop', description: 'Attend the resume writing workshop and produce a final draft.', category: 'Career Readiness', progressEventCount: 0, benchmarkCount: 0 },
+                { goalId: 'g8', goalParentId: null, description: 'Complete practice tests and study modules for GED math and reading sections.', category: 'Academics', baseline: '', progressEventCount: 6, benchmarkCount: 0 },
+                { goalId: 'g9', goalParentId: null, description: 'Attend the resume writing workshop and produce a final draft.', category: 'Career Readiness', baseline: '', progressEventCount: 0, benchmarkCount: 0 },
             ],
         },
         '4': {
             studentIdentifier: 'T.W',
             goals: [
-                { goalId: 'g10', goalParentId: null, title: 'Public speaking practice', description: 'Present in front of the class at least once per month.', category: 'Communication', progressEventCount: 4, benchmarkCount: 0 },
-                { goalId: 'g11', goalParentId: null, title: 'Math placement improvement', description: 'Move up one placement level in math by the end of the semester.', category: 'Academics', progressEventCount: 7, benchmarkCount: 0 },
-                { goalId: 'g12', goalParentId: null, title: 'Conflict resolution strategies', description: 'Learn and apply at least three de-escalation techniques.', category: 'Behavior', progressEventCount: 2, benchmarkCount: 0 },
-                { goalId: 'g13', goalParentId: null, title: 'Daily attendance streak', description: 'Achieve a 30-day unbroken attendance streak.', category: 'Behavior', progressEventCount: 0, benchmarkCount: 0 },
-                { goalId: 'g14', goalParentId: null, title: 'Job shadow experience', description: 'Complete a job shadow day in a field of interest.', category: 'Career Readiness', progressEventCount: 1, benchmarkCount: 0 },
+                { goalId: 'g10', goalParentId: null, description: 'Present in front of the class at least once per month.', category: 'Communication', baseline: '', progressEventCount: 4, benchmarkCount: 0 },
+                { goalId: 'g11', goalParentId: null, description: 'Move up one placement level in math by the end of the semester.', category: 'Academics', baseline: '', progressEventCount: 7, benchmarkCount: 0 },
+                { goalId: 'g12', goalParentId: null, description: 'Learn and apply at least three de-escalation techniques.', category: 'Behavior', baseline: '', progressEventCount: 2, benchmarkCount: 0 },
+                { goalId: 'g13', goalParentId: null, description: 'Achieve a 30-day unbroken attendance streak.', category: 'Behavior', baseline: '', progressEventCount: 0, benchmarkCount: 0 },
+                { goalId: 'g14', goalParentId: null, description: 'Complete a job shadow day in a field of interest.', category: 'Career Readiness', baseline: '', progressEventCount: 1, benchmarkCount: 0 },
             ],
         },
         '5': {
             studentIdentifier: 'L.C',
             goals: [
-                { goalId: 'g15', goalParentId: null, title: 'Improve typing speed', description: 'Reach 40 WPM with 95% accuracy on typing assessments.', category: 'Career Readiness', progressEventCount: 3, benchmarkCount: 0 },
+                { goalId: 'g15', goalParentId: null, description: 'Reach 40 WPM with 95% accuracy on typing assessments.', category: 'Career Readiness', baseline: '', progressEventCount: 3, benchmarkCount: 0 },
             ],
         },
     };
@@ -116,9 +116,9 @@ export class DummyStudentService {
         const newGoal: StudentGoalItem = {
             goalId: `g${Date.now()}`,
             goalParentId: null,
-            title: data.title,
             description: data.description,
             category: data.category,
+            baseline: data.baseline,
             progressEventCount: 0,
             benchmarkCount: 0,
         };
@@ -174,9 +174,9 @@ export class DummyStudentService {
         }
 
         const benchmarks: BenchmarkDto[] = [
-            { benchmarkId: 'bm1', goalId: 'g1', goalTitle: 'Improve reading comprehension', benchmark: 'Student will identify the main idea of a grade-level nonfiction passage with 80% accuracy.', createdByName: 'Jane Smith', createdAt: new Date('2026-02-15'), updatedAt: null },
-            { benchmarkId: 'bm2', goalId: 'g1', goalTitle: 'Improve reading comprehension', benchmark: 'Student will make at least two supported inferences per reading session.', createdByName: 'Jane Smith', createdAt: new Date('2026-02-16'), updatedAt: new Date('2026-02-20') },
-            { benchmarkId: 'bm3', goalId: 'g3', goalTitle: 'Weekly journal entries', benchmark: 'Student will complete a minimum of one paragraph (5 sentences) per journal entry.', createdByName: 'John Doe', createdAt: new Date('2026-02-18'), updatedAt: null },
+            { benchmarkId: 'bm1', goalId: 'g1', goalCategory: 'Academics', benchmark: 'Student will identify the main idea of a grade-level nonfiction passage with 80% accuracy.', createdByName: 'Jane Smith', createdAt: new Date('2026-02-15'), updatedAt: null },
+            { benchmarkId: 'bm2', goalId: 'g1', goalCategory: 'Academics', benchmark: 'Student will make at least two supported inferences per reading session.', createdByName: 'Jane Smith', createdAt: new Date('2026-02-16'), updatedAt: new Date('2026-02-20') },
+            { benchmarkId: 'bm3', goalId: 'g3', goalCategory: 'Communication', benchmark: 'Student will complete a minimum of one paragraph (5 sentences) per journal entry.', createdByName: 'John Doe', createdAt: new Date('2026-02-18'), updatedAt: null },
         ];
 
         return ApiResult.ok({
diff --git a/ui/winstudentgoaltracker/src/app/shared/services/student.service.ts b/ui/winstudentgoaltracker/src/app/shared/services/student.service.ts
index 7831e10..86d5f5f 100644
--- a/ui/winstudentgoaltracker/src/app/shared/services/student.service.ts
+++ b/ui/winstudentgoaltracker/src/app/shared/services/student.service.ts
@@ -216,9 +216,9 @@ export class StudentService {
     }
 
     // *****************************************************************
-    // Updates a goal's title, description, and category.
+    // Updates a goal's description, category, and baseline.
     // *****************************************************************
-    async updateGoal(studentId: string, goalId: string, data: { title?: string; description?: string; category?: string }): Promise<ApiResult<any>> {
+    async updateGoal(studentId: string, goalId: string, data: { description?: string; category?: string; baseline?: string }): Promise<ApiResult<any>> {
         try {
             const result = await firstValueFrom(
                 this.http.put<ResponseResult<any>>(`${this.base}/api/Student/${studentId}/goals/${goalId}`, data)