diff --git a/src/Vegasco-Web/src/app/modules/entries/edit-entry/edit-entry.component.html b/src/Vegasco-Web/src/app/modules/entries/edit-entry/edit-entry.component.html
new file mode 100644
index 0000000..d5ba414
--- /dev/null
+++ b/src/Vegasco-Web/src/app/modules/entries/edit-entry/edit-entry.component.html
@@ -0,0 +1,89 @@
+@if (!loaded) {
+  <p-skeleton height="4rem" styleClass="mb-2" />
+} @else {
+  <form [formGroup]="formGroup" class="flex flex-col gap-4" (ngSubmit)="onSubmit()">
+
+    <div class="flex gap-2 w-full">
+      <div class="flex flex-col gap-2 w-full">
+        <label for="date"> Datum </label>
+        <p-datepicker [iconDisplay]="'input'"
+                      [firstDayOfWeek]="1"
+                      placeholder="Datum auswählen"
+                      [showIcon]="true"
+                      inputId="date"
+                      formControlName="date"
+                      styleClass="w-full"
+                      dateFormat="dd.mm.yy" />
+      </div>
+
+      <div class="flex flex-col gap-2 w-full">
+        <label for="time"> Uhrzeit </label>
+        <p-datepicker [iconDisplay]="'input'"
+                      [showIcon]="true"
+                      [timeOnly]="true"
+                      placeholder="Uhrzeit auswählen"
+                      inputId="time"
+                      formControlName="time"
+                      styleClass="w-full"
+                      inputStyleClass="w-full" />
+      </div>
+    </div>
+
+    <div class="flex flex-col gap-2">
+      <label for="rabbit"> Kaninchen </label>
+      @if (rabbits$ | async; as rabbits) {
+        <p-select
+          [options]="rabbits"
+          placeholder="Kaninchen auswählen"
+          formControlName="rabbit"
+          optionLabel="name"
+          inputId="rabbit"
+          styleClass="w-full" />
+      }
+    </div>
+
+    <div class="flex flex-col gap-2">
+      <label for="medicines"> Medizin </label>
+      @if (medicines$ | async; as medicines) {
+        <p-multiSelect
+          [options]="medicines"
+          [showToggleAll]="false"
+          [showHeader]="false"
+          [autoOptionFocus]="false"
+          [filter]="false"
+          [showClear]="true"
+          [maxSelectedLabels]="medicines.length"
+          optionLabel="abbreviation"
+          formControlName="medicines"
+          inputId="medicines"
+          placeholder="Medizin auswählen"
+          display="chip"
+          styleClass="w-full">
+          <ng-template let-medicine pTemplate="item">
+            {{ medicine.name }} ({{ medicine.abbreviation }})
+          </ng-template>
+        </p-multiSelect>
+      }
+    </div>
+
+    <div class="flex flex-col gap-2">
+      <label for="weight"> Gewicht </label>
+      <p-inputGroup>
+        <input id="weight" placeholder="Gewicht eingeben" type="number" min="1" pInputText formControlName="weight" />
+        <p-inputGroupAddon>g</p-inputGroupAddon>
+      </p-inputGroup>
+    </div>
+
+    <div class="flex flex-col gap-2">
+      <label for="comment"> Kommentar </label>
+      <input pInputText id="comment" placeholder="Kommentar eingeben" type="text" formControlName="comment"
+             class="w-full" />
+    </div>
+
+    <div class="flex gap-2">
+      <p-button type="button" label="Abbrechen" (click)="navigateToOverviewPage()" severity="warn" />
+      <p-button type="submit" label="Abschicken" severity="success" [disabled]="formGroup.invalid" />
+    </div>
+
+  </form>
+}
diff --git a/src/Vegasco-Web/src/app/modules/entries/edit-entry/edit-entry.component.scss b/src/Vegasco-Web/src/app/modules/entries/edit-entry/edit-entry.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/Vegasco-Web/src/app/modules/entries/edit-entry/edit-entry.component.ts b/src/Vegasco-Web/src/app/modules/entries/edit-entry/edit-entry.component.ts
new file mode 100644
index 0000000..1b0d5ba
--- /dev/null
+++ b/src/Vegasco-Web/src/app/modules/entries/edit-entry/edit-entry.component.ts
@@ -0,0 +1,50 @@
+import { AsyncPipe } from '@angular/common';
+import { Component, inject } from '@angular/core';
+import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
+import { ButtonModule } from 'primeng/button';
+import { ChipModule } from 'primeng/chip';
+import { DatePickerModule } from 'primeng/datepicker';
+import { FloatLabelModule } from 'primeng/floatlabel';
+import { InputGroupModule } from 'primeng/inputgroup';
+import { InputGroupAddonModule } from 'primeng/inputgroupaddon';
+import { InputNumberModule } from 'primeng/inputnumber';
+import { InputTextModule } from 'primeng/inputtext';
+import { MultiSelectModule } from 'primeng/multiselect';
+import { SelectModule } from 'primeng/select';
+import { SkeletonModule } from 'primeng/skeleton';
+
+@Component({
+  selector: 'app-edit-entry',
+  imports: [
+    AsyncPipe,
+    ButtonModule,
+    ChipModule,
+    DatePickerModule,
+    FloatLabelModule,
+    InputGroupAddonModule,
+    InputGroupModule,
+    InputNumberModule,
+    InputTextModule,
+    MultiSelectModule,
+    ReactiveFormsModule,
+    SelectModule,
+    SkeletonModule,
+  ],
+  templateUrl: './edit-entry.component.html',
+  styleUrl: './edit-entry.component.scss'
+})
+export class EditEntryComponent {
+  private readonly formBuilder = inject(FormBuilder);
+
+  protected readonly formGroup = this.formBuilder.group({
+    date: [<Date | null>null],
+    time: [<Date | null>null],
+    rabbit: [<Rabbit | null>null, Validators.required],
+    weight: [
+      <number | null>null,
+      Validators.min(1),
+    ],
+    medicines: [<Medicine[]>[]],
+    comment: [<string | null>null],
+  });
+}
diff --git a/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.html b/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.html
index 7cd05d7..f10990b 100644
--- a/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.html
+++ b/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.html
@@ -2,34 +2,37 @@
   <p-scrollTop />
   <div class="mb-4 flex gap-2 md:justify-between">
     <div class="basis-full lg:basis-1/4 md:basis-1/2 p-0">
-      <p-select styleClass="w-full" [formControl]="selectedRabbit" placeholder="Kaninchen" [showClear]="true"
-        [options]="(rabbits$ | async)!" optionLabel="name" />
+      <!-- <p-select styleClass="w-full" [formControl]="selectedRabbit" placeholder="Kaninchen" [showClear]="true"
+        [options]="(rabbits$ | async)!" optionLabel="name" /> -->
     </div>
     <div>
       <p-button label="Erstellen" routerLink="/weight-entries/create">
-        <ng-icon name="matAddSharp"></ng-icon>
+        <!-- <ng-icon name="matAddSharp"></ng-icon> -->
       </p-button>
     </div>
   </div>
   <div>
-    @if (filteredWeightEntries$ | async; as weightEntries) {
-      <p-dataView [value]="weightEntries"
-                  [paginator]="true"
-                  [rows]="rowsPerPageDefaultOption"
-                  [rowsPerPageOptions]="rowsPerPageOptions"
-                  [pageLinks]="0"
-                  [showCurrentPageReport]="true"
-                  [currentPageReportTemplate]="currentPageReportTemplate"
-                  layout="list">
-        <ng-template #list let-entries>
-          <div class="flex flex-col gap-2">
-            @for (weightEntry of entries; track weightEntry.id) {
-              <app-weight-entry-card [weightEntry]="weightEntry"
-                                     (entryDeleted)="onEntryDeleted($event)"></app-weight-entry-card>
-            }
-          </div>
-        </ng-template>
-      </p-dataView>
+    @if (consumptionEntries$ | async; as entries) {
+    <p-dataView
+      [value]="entries"
+      [paginator]="true"
+      [rows]="rowsPerPageDefaultOption"
+      [rowsPerPageOptions]="rowsPerPageOptions"
+      [pageLinks]="0"
+      [showCurrentPageReport]="true"
+      [currentPageReportTemplate]="currentPageReportTemplate"
+      layout="list"
+    >
+      <ng-template #list let-entries>
+        <div class="flex flex-col gap-2">
+          @for (entry of entries; track entry.id) {
+          {{ entry | json }}
+          <!-- <app-weight-entry-card [weightEntry]="weightEntry"
+                                     (entryDeleted)="onEntryDeleted($event)"></app-weight-entry-card> -->
+          }
+        </div>
+      </ng-template>
+    </p-dataView>
     } @else {
     <div class="flex flex-col gap-2">
       @for (_ of skeletonsIterationSource; track $index) {
diff --git a/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.ts b/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.ts
index 1bc6dc1..e024121 100644
--- a/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.ts
+++ b/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.ts
@@ -1,24 +1,19 @@
 import { CommonModule } from '@angular/common';
 import { Component, inject } from '@angular/core';
-import { FormControl, ReactiveFormsModule } from '@angular/forms';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { ReactiveFormsModule } from '@angular/forms';
 import { RouterLink } from '@angular/router';
-import { MessageService } from 'primeng/api';
 import { ButtonModule } from 'primeng/button';
 import { DataViewModule } from 'primeng/dataview';
-import { SelectModule } from 'primeng/select';
 import { ScrollTopModule } from 'primeng/scrolltop';
+import { SelectModule } from 'primeng/select';
 import { SkeletonModule } from 'primeng/skeleton';
 import {
-  BehaviorSubject,
-  combineLatest,
   map,
   Observable,
-  of,
-  startWith,
-  tap,
+  tap
 } from 'rxjs';
-import { HttpClient } from '@angular/common/http';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { Client, GetConsumptions_ResponseDto } from '../../../shared/api/swagger.generated';
 
 @Component({
   selector: 'app-entries',
@@ -36,18 +31,24 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
   styleUrl: './entries.component.scss'
 })
 export class EntriesComponent {
-  private readonly http = inject(HttpClient);
+  private readonly client = inject(Client);
 
-  protected readonly consumptionEntries$: Observable<ConsumptionEntry[]>;
+  protected readonly consumptionEntries$: Observable<GetConsumptions_ResponseDto[] | undefined>;
+
+  protected readonly rowsPerPageDefaultOption = 25;
+  protected readonly rowsPerPageOptions = [10, 25, 50, 100];
+  protected readonly currentPageReportTemplate = '{currentPage} / {totalPages}';
+
+  protected readonly skeletonsIterationSource = Array(10).fill(0);
 
   constructor() {
-    this.consumptionEntries$ = this.http.get<GetConsumptionEntriesResponse>('/api/v1/consumptions')
+    this.consumptionEntries$ = this.client.consumptionsGET()
       .pipe(
         takeUntilDestroyed(),
         tap((response) => {
           console.log('Entries response:', response);
         }),
-        map(response => response.consumptions)
-      );
+        map((response) => response.consumptions)
+      )
   }
 }