diff --git a/src/app/app.scss b/src/app/app.scss
index 29334f4..79354d0 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -1,5 +1,5 @@
 .app-content {
-  padding: 2rem;
+  padding: 0.5rem;
 }
 
 h1 {
diff --git a/src/app/components/add-expense/add-expense.component.html b/src/app/components/add-expense/add-expense.component.html
deleted file mode 100644
index afc5f76..0000000
--- a/src/app/components/add-expense/add-expense.component.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<div class="add-expense-container">
-  <mat-card appearance="outlined">
-    <mat-card-header class="add-expense-header">
-      <mat-card-title>Track new Expense</mat-card-title>
-    </mat-card-header>
-
-    <mat-card-content>
-      <div class="add-expense-dropdowns">
-        <mat-form-field appearance="outline">
-          <mat-label>Date</mat-label>
-          <input matInput [matDatepicker]="expenseDatePicker" [formField]="expenseForm.date">
-          <mat-datepicker-toggle matIconSuffix [for]="expenseDatePicker"></mat-datepicker-toggle>
-          <mat-datepicker #expenseDatePicker></mat-datepicker>
-        </mat-form-field>
-
-        <mat-form-field appearance="outline">
-          <mat-label>Cents</mat-label>
-          <input type="number" matInput [formField]="expenseForm.cents">
-        </mat-form-field>
-
-        <mat-form-field appearance="outline">
-          <mat-label>Category</mat-label>
-          <input type="text" matInput [matAutocomplete]="categoryAuto" [formField]="expenseForm.category" [value]="expenseForm.category()">
-          <mat-autocomplete [displayWith]="display" autoActiveFirstOption #categoryAuto="matAutocomplete">
-            @for (category of categories(); track category.id) {
-              <mat-option [value]="category">{{ category.name }}</mat-option>
-            }
-          </mat-autocomplete>
-        </mat-form-field>
-
-        <mat-form-field appearance="outline">
-          <mat-label>Merchant</mat-label>
-          <input type="text" matInput [matAutocomplete]="merchantAuto" [formField]="expenseForm.merchant">
-          <mat-autocomplete [displayWith]="display" autoActiveFirstOption #merchantAuto="matAutocomplete">
-            @for (merchant of merchants(); track merchant.id) {
-              <mat-option [value]="merchant">{{ merchant.name }}</mat-option>
-            }
-          </mat-autocomplete>
-        </mat-form-field>
-      </div>
-
-      <div class="add-expense-additional">
-        <mat-form-field appearance="outline">
-          <mat-label>Tags</mat-label>
-          <mat-select disableRipple multiple [formField]="expenseForm.tags">
-            @for (tag of tags(); track tag.id) {
-              <mat-option [value]="tag">{{ tag.name }}</mat-option>
-            }
-          </mat-select>
-        </mat-form-field>
-
-        <mat-form-field appearance="outline" class="add-expense-note">
-          <mat-label>Note</mat-label>
-          <textarea rows="1" matInput [formField]="expenseForm.note"></textarea>
-        </mat-form-field>
-      </div>
-    </mat-card-content>
-
-    <mat-card-footer class="add-expense-footer">
-      <mat-card-actions>
-        <button matButton="tonal" [disabled]="!enableSaveButton()" (click)="saveClick()">Save</button>
-      </mat-card-actions>
-
-      @if (errorSaving()) {
-        <mat-error>
-          {{ errorSaving() }}
-        </mat-error>
-      }
-    </mat-card-footer>
-  </mat-card>
-</div>
diff --git a/src/app/components/add-expense/add-expense.component.scss b/src/app/components/add-expense/add-expense.component.scss
deleted file mode 100644
index 74c3967..0000000
--- a/src/app/components/add-expense/add-expense.component.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-.add-expense-header {
-  padding-bottom: 1rem;
-}
-
-.add-expense-footer {
-  padding: 0 0 1rem 0.5rem;
-}
-
-.add-expense-dropdowns {
-  display: flex;
-  gap: 1rem;
-  justify-content: space-between;
-}
-
-.add-expense-additional {
-  display: flex;
-  gap: 1rem;
-  justify-content: space-between;
-}
-
-.add-expense-note {
-  width: 100%;
-}
diff --git a/src/app/components/expense-list/expense-list.component.html b/src/app/components/expense-list/expense-list.component.html
index bed23d2..080cafc 100644
--- a/src/app/components/expense-list/expense-list.component.html
+++ b/src/app/components/expense-list/expense-list.component.html
@@ -1,34 +1,37 @@
 <div class="expense-list-container">
-  <mat-card appearance="outlined" class="expense-table-card">
-    <mat-card-header>
-      <mat-card-title>Tracked Expenses</mat-card-title>
-    </mat-card-header>
+  @for (expense of expenses(); track expense.id) {
+    <app-expense [expense]="expense" />
+  }
+<!--  <mat-card appearance="outlined" class="expense-table-card">-->
+<!--    <mat-card-header>-->
+<!--      <mat-card-title>Tracked Expenses</mat-card-title>-->
+<!--    </mat-card-header>-->
 
-    <mat-card-content>
-      <table mat-table [dataSource]="expenses()" class="expense-table">
-        <ng-container matColumnDef="date">
-          <th mat-header-cell *matHeaderCellDef>Date</th>
-          <td mat-cell *matCellDef="let expense">{{ `${expense.year}/${expense.month}/${expense.day}` | date }}</td>
-        </ng-container>
+<!--    <mat-card-content>-->
+<!--      <table mat-table [dataSource]="expenses()" class="expense-table">-->
+<!--        <ng-container matColumnDef="date">-->
+<!--          <th mat-header-cell *matHeaderCellDef>Date</th>-->
+<!--          <td mat-cell *matCellDef="let expense">{{ `${expense.year}/${expense.month}/${expense.day}` | date }}</td>-->
+<!--        </ng-container>-->
 
-        <ng-container matColumnDef="amount">
-          <th mat-header-cell *matHeaderCellDef>Amount</th>
-          <td mat-cell *matCellDef="let expense">{{ (expense.cents / 100) | currency: 'USD' }}</td>
-        </ng-container>
+<!--        <ng-container matColumnDef="amount">-->
+<!--          <th mat-header-cell *matHeaderCellDef>Amount</th>-->
+<!--          <td mat-cell *matCellDef="let expense">{{ (expense.cents / 100) | currency: 'USD' }}</td>-->
+<!--        </ng-container>-->
 
-        <ng-container matColumnDef="category">
-          <th mat-header-cell *matHeaderCellDef>Category</th>
-          <td mat-cell *matCellDef="let expense">{{ expense.category.name }}</td>
-        </ng-container>
+<!--        <ng-container matColumnDef="category">-->
+<!--          <th mat-header-cell *matHeaderCellDef>Category</th>-->
+<!--          <td mat-cell *matCellDef="let expense">{{ expense.category.name }}</td>-->
+<!--        </ng-container>-->
 
-        <ng-container matColumnDef="merchant">
-          <th mat-header-cell *matHeaderCellDef>Merchant</th>
-          <td mat-cell *matCellDef="let expense">{{ expense.merchant?.name ?? '--' }}</td>
-        </ng-container>
+<!--        <ng-container matColumnDef="merchant">-->
+<!--          <th mat-header-cell *matHeaderCellDef>Merchant</th>-->
+<!--          <td mat-cell *matCellDef="let expense">{{ expense.merchant?.name ?? '&#45;&#45;' }}</td>-->
+<!--        </ng-container>-->
 
-        <tr mat-header-row *matHeaderRowDef="columns"></tr>
-        <tr mat-row *matRowDef="let rowData; columns: columns"></tr>
-      </table>
-    </mat-card-content>
-  </mat-card>
+<!--        <tr mat-header-row *matHeaderRowDef="columns"></tr>-->
+<!--        <tr mat-row *matRowDef="let rowData; columns: columns"></tr>-->
+<!--      </table>-->
+<!--    </mat-card-content>-->
+<!--  </mat-card>-->
 </div>
diff --git a/src/app/components/expense-list/expense-list.component.scss b/src/app/components/expense-list/expense-list.component.scss
index e69de29..818821c 100644
--- a/src/app/components/expense-list/expense-list.component.scss
+++ b/src/app/components/expense-list/expense-list.component.scss
@@ -0,0 +1,4 @@
+.expense-list-container {
+  display: grid;
+  gap: 1rem;
+}
diff --git a/src/app/components/expense-list/expense-list.component.ts b/src/app/components/expense-list/expense-list.component.ts
index 08864c8..6ebaf88 100644
--- a/src/app/components/expense-list/expense-list.component.ts
+++ b/src/app/components/expense-list/expense-list.component.ts
@@ -3,10 +3,11 @@ import { ExpenseService } from '../../services/expense.service';
 import { MatTableModule } from '@angular/material/table';
 import { CurrencyPipe, DatePipe } from '@angular/common';
 import { MatCardModule } from '@angular/material/card';
+import {ExpenseComponent} from '../expense/expense.component';
 
 @Component({
   selector: 'app-expense-list',
-  imports: [MatTableModule, MatCardModule, DatePipe, CurrencyPipe],
+  imports: [MatTableModule, MatCardModule, DatePipe, CurrencyPipe, ExpenseComponent],
   templateUrl: './expense-list.component.html',
   styleUrl: './expense-list.component.scss',
 })
diff --git a/src/app/components/expense/expense.component.html b/src/app/components/expense/expense.component.html
new file mode 100644
index 0000000..66f6e56
--- /dev/null
+++ b/src/app/components/expense/expense.component.html
@@ -0,0 +1,96 @@
+<div class="expense-container">
+  <mat-card appearance="outlined">
+    <mat-card-header>
+      @if (state() === 'add') {
+        <div class="expense-header">
+          <mat-card-title>Track new Expense</mat-card-title>
+          <button matButton="tonal" [disabled]="!enableSaveButton()" (click)="saveClick()">Save</button>
+        </div>
+      }
+      @if (state() === 'view') {
+        <div class="expense-header">
+          <mat-card-title>{{ `${expense()?.year}-${expense()?.month}-${expense()?.day}` | date }}</mat-card-title>
+
+          <button matIconButton>
+            <mat-icon>edit</mat-icon>
+          </button>
+        </div>
+      }
+    </mat-card-header>
+
+    <mat-card-content>
+      @if (state() === 'add') {
+        <div class="expense-content">
+          <mat-form-field appearance="outline">
+            <mat-label>Date</mat-label>
+            <input matInput [matDatepicker]="expenseDatePicker" [formField]="expenseForm.date">
+            <mat-datepicker-toggle matIconSuffix [for]="expenseDatePicker"></mat-datepicker-toggle>
+            <mat-datepicker  #expenseDatePicker></mat-datepicker>
+          </mat-form-field>
+
+          <mat-form-field appearance="outline">
+            <mat-label>Cents</mat-label>
+            <input type="number" matInput [formField]="expenseForm.cents">
+          </mat-form-field>
+
+          <mat-form-field appearance="outline">
+            <mat-label>Category</mat-label>
+            <input type="text" matInput [matAutocomplete]="categoryAuto" [formField]="expenseForm.category" [value]="expenseForm.category()">
+            <mat-autocomplete [displayWith]="autocompleteDisplay" autoActiveFirstOption #categoryAuto="matAutocomplete">
+              @for (category of categories(); track category.id) {
+                <mat-option [value]="category">{{ category.name }}</mat-option>
+              }
+            </mat-autocomplete>
+          </mat-form-field>
+
+          <mat-form-field appearance="outline">
+            <mat-label>Merchant</mat-label>
+            <input type="text" matInput [matAutocomplete]="merchantAuto" [formField]="expenseForm.merchant">
+            <mat-autocomplete [displayWith]="autocompleteDisplay" autoActiveFirstOption #merchantAuto="matAutocomplete">
+              @for (merchant of merchants(); track merchant.id) {
+                <mat-option [value]="merchant">{{ merchant.name }}</mat-option>
+              }
+            </mat-autocomplete>
+          </mat-form-field>
+
+          <mat-form-field appearance="outline">
+            <mat-label>Note</mat-label>
+            <textarea rows="1" matInput [formField]="expenseForm.note"></textarea>
+          </mat-form-field>
+
+          <mat-form-field appearance="outline">
+            <mat-label>Tags</mat-label>
+            <mat-select disableRipple multiple [formField]="expenseForm.tags">
+              @for (tag of tags(); track tag.id) {
+                <mat-option [value]="tag">{{ tag.name }}</mat-option>
+              }
+            </mat-select>
+          </mat-form-field>
+        </div>
+      }
+      @if (state() === 'view') {
+        <div class="expense-content">
+          <div>
+            Amount: {{ expense()?.cents! / 100 | currency}}
+          </div>
+
+          <div>
+            Category: {{ expense()?.category!.name }}
+          </div>
+
+          <div>
+            Merchant: {{ expense()?.merchant?.name ?? '--' }}
+          </div>
+        </div>
+
+        <div>
+          Note: {{ expense()?.note ?? '--' }}
+        </div>
+
+        <div>
+          Tags:
+        </div>
+      }
+    </mat-card-content>
+  </mat-card>
+</div>
diff --git a/src/app/components/expense/expense.component.scss b/src/app/components/expense/expense.component.scss
new file mode 100644
index 0000000..08a52af
--- /dev/null
+++ b/src/app/components/expense/expense.component.scss
@@ -0,0 +1,43 @@
+.expense-container {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  mat-card {
+    max-width: 800px;
+    width: 100%;
+  }
+}
+
+mat-card-header {
+  padding-bottom: 1rem;
+
+  .expense-header {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+}
+
+.expense-content {
+  display: grid;
+}
+
+mat-form-field {
+  width: 100%;
+}
+
+@media (min-width: 550px) {
+  .expense-content {
+    grid-template-columns: 1fr 1fr;
+    gap: 1rem;
+  }
+}
+
+@media (min-width: 800px) {
+  .expense-content {
+    grid-template-columns: 1fr 1fr 1fr;
+  }
+}
diff --git a/src/app/components/add-expense/add-expense.component.ts b/src/app/components/expense/expense.component.ts
similarity index 66%
rename from src/app/components/add-expense/add-expense.component.ts
rename to src/app/components/expense/expense.component.ts
index e3f0d4e..11dd70a 100644
--- a/src/app/components/add-expense/add-expense.component.ts
+++ b/src/app/components/expense/expense.component.ts
@@ -1,4 +1,4 @@
-import { Component, computed, signal } from '@angular/core';
+import { Component, computed, input, signal } from '@angular/core';
 import { Category, CategoryService } from '../../services/category.service';
 import { Merchant, MerchantService } from '../../services/merchant.service';
 import { Tag, TagService } from '../../services/tag.service';
@@ -11,11 +11,12 @@ import { MatAutocompleteModule } from '@angular/material/autocomplete';
 import { MatSelectModule } from '@angular/material/select';
 import { MatButtonModule } from '@angular/material/button';
 import { provideNativeDateAdapter } from '@angular/material/core';
-import { CreateExpense, ExpenseService } from '../../services/expense.service';
-import { DatePipe } from '@angular/common';
+import { CreateExpense, Expense, ExpenseService } from '../../services/expense.service';
+import {CurrencyPipe, DatePipe} from '@angular/common';
+import {MatIcon} from '@angular/material/icon';
 
 interface ExpenseForm {
-  date: Date;
+  date: Date | string;
   cents: number;
   category: Category | string;
   merchant: Merchant | string;
@@ -24,13 +25,17 @@ interface ExpenseForm {
 }
 
 @Component({
-  selector: 'app-add-expense',
-  imports: [MatDatepickerModule, MatFormFieldModule, MatInputModule, MatCardModule, MatAutocompleteModule, MatSelectModule, MatButtonModule, FormField],
+  selector: 'app-expense',
+  imports: [MatDatepickerModule, MatFormFieldModule, MatInputModule, MatCardModule, MatAutocompleteModule, MatSelectModule, MatButtonModule, FormField, DatePipe, MatIcon, CurrencyPipe],
   providers: [provideNativeDateAdapter(), DatePipe],
-  templateUrl: './add-expense.component.html',
-  styleUrl: './add-expense.component.scss',
+  templateUrl: './expense.component.html',
+  styleUrl: './expense.component.scss',
 })
-export class AddExpenseComponent {
+export class ExpenseComponent {
+  public expense = input<Expense>();
+  protected expenseMode = signal<'view' | 'edit'>('view');
+  protected state = computed<'add' | 'view' | 'edit'>(() => this.expense() ? this.expenseMode() : 'add');
+  protected saving = signal(false);
   protected categories = computed(() => this.categoryService.categories());
   protected merchants = computed(() => this.merchantService.merchants());
   protected tags = computed(() => this.tagService.tags());
@@ -41,20 +46,24 @@ export class AddExpenseComponent {
     const merchantValid = this.expenseForm.merchant().valid();
     const noteValid = this.expenseForm.note().valid();
 
-    return dateValid && centsValid && categoryValid && merchantValid && noteValid;
+    return dateValid && centsValid && categoryValid && merchantValid && noteValid && !this.saving();
   });
-  protected saving = signal(false);
-  protected errorSaving = signal('');
 
-  private defaultFormState: ExpenseForm = {
-    date: new Date(),
-    cents: NaN,
-    category: '',
-    merchant: '',
-    note: '',
-    tags: []
+  private lastSelectedDate: Date | undefined;
+  private expenseDate = computed(() => {
+    return this.expense()
+      ? new Date(`${this.expense()?.year}-${this.expense()?.month}-${this.expense()?.day}`)
+      : this.lastSelectedDate ?? '';
+  });
+  private defaultForm: ExpenseForm = {
+    date: this.expenseDate(),
+    cents: this.expense()?.cents ?? NaN,
+    category: this.expense()?.category ?? '',
+    merchant: this.expense()?.merchant ?? '',
+    note: this.expense()?.note ?? '',
+    tags: this.expense()?.tags ?? []
   };
-  private expenseModel = signal<ExpenseForm>(this.defaultFormState);
+  private expenseModel = signal<ExpenseForm>(this.defaultForm);
   public expenseForm = form(this.expenseModel, (schema) => {
     required(schema.date);
     required(schema.cents);
@@ -69,7 +78,6 @@ export class AddExpenseComponent {
                      private readonly datePipe: DatePipe) { }
 
   public async saveClick(): Promise<void> {
-    this.errorSaving.set('');
     const saveExpenseModel = this.expenseModel();
     const date = this.datePipe.transform(saveExpenseModel.date, 'yyyy-MM-dd')?.split('-') ?? [];
     const expense: CreateExpense = {
@@ -86,18 +94,19 @@ export class AddExpenseComponent {
     this.saving.set(true);
     try {
       await this.expenseService.postExpense(expense);
-      this.expenseModel.set({ ...this.defaultFormState, date: saveExpenseModel.date });
+      this.lastSelectedDate = saveExpenseModel.date ? saveExpenseModel.date as Date : undefined;
+      this.expenseModel.set({ ...this.defaultForm, date: saveExpenseModel.date });
       this.expenseForm().reset(this.expenseModel());
     }
     catch (error) {
-      this.errorSaving.set(`Error saving expense: ${error}`)
+      console.error(error);
     }
     finally {
       this.saving.set(false);
     }
   }
 
-  public display(value: Merchant | Category | Tag) {
+  public autocompleteDisplay(value: Merchant | Category) {
     return value.name ?? null;
   }
 }
diff --git a/src/app/pages/expenses/expenses.html b/src/app/pages/expenses/expenses.html
index 7d8dce9..2add09d 100644
--- a/src/app/pages/expenses/expenses.html
+++ b/src/app/pages/expenses/expenses.html
@@ -1,4 +1,4 @@
 <div class="expenses-container">
-  <app-add-expense />
+  <app-expense />
   <app-expense-list />
 </div>
diff --git a/src/app/pages/expenses/expenses.ts b/src/app/pages/expenses/expenses.ts
index 90bd738..3132b93 100644
--- a/src/app/pages/expenses/expenses.ts
+++ b/src/app/pages/expenses/expenses.ts
@@ -1,12 +1,12 @@
 import { Component } from '@angular/core';
 import { ExpenseListComponent } from '../../components/expense-list/expense-list.component';
-import { AddExpenseComponent } from '../../components/add-expense/add-expense.component';
+import { ExpenseComponent } from '../../components/expense/expense.component';
 
 @Component({
   selector: 'app-expenses',
   imports: [
     ExpenseListComponent,
-    AddExpenseComponent
+    ExpenseComponent
   ],
   templateUrl: './expenses.html',
   styleUrl: './expenses.scss'