diff --git a/Wonky.Client/Components/WorkplaceListComponent.razor b/Wonky.Client/Components/WorkplaceListComponent.razor
new file mode 100644
index 00000000..50175aa8
--- /dev/null
+++ b/Wonky.Client/Components/WorkplaceListComponent.razor
@@ -0,0 +1,40 @@
+@using Wonky.Entity.DTO
+@using Wonky.Entity.Views
+
+@if (Workplaces.Any())
+{
+    <div class="list-group">
+        <div class="row">
+            <div class="col">
+                Arbejdssted
+            </div>
+            <div class="col">
+                Note
+            </div>
+        </div>
+        @foreach (var workplace in Workplaces)
+        {
+            <a class="list-group-item list-group-item-action" href="/companies/@CompanyId/workplaces/@workplace.WorkplaceId">
+                <div class="row">
+                    <div class="col">
+                        @workplace.Name
+                    </div>
+                    <div class="col">
+                        @workplace.Description
+                    </div>
+                </div>
+            </a>
+        }
+    </div>
+}
+else
+{
+    <div>Ingen data</div>
+}
+
+@code {
+
+    [Parameter] public List<WorkplaceListView> Workplaces { get; set; } = new();
+
+    [Parameter] public string CompanyId { get; set; } = "";
+}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/WorkplaceListPage.razor b/Wonky.Client/Pages/WorkplaceListPage.razor
index 863cca59..eb561490 100644
--- a/Wonky.Client/Pages/WorkplaceListPage.razor
+++ b/Wonky.Client/Pages/WorkplaceListPage.razor
@@ -16,26 +16,15 @@
 *@
 
 @using Microsoft.AspNetCore.Authorization
+@using Wonky.Client.Components
 @attribute [Authorize(Roles = "Advisor")]
 @page "/companies/{CompanyId}/workplaces"
 
-<div class="card">
-    <div class="card-header">
-        <div class="card-title">
-            <h2>@_company.Name</h2>
-        </div>
-    </div>
-    <div class="card-body">
-        @if (_workplaces.Any())
-        {
-            <ul class="list-group">
-                @foreach (var workplace in _workplaces)
-                {
-                    <a class="list-group-item list-group-item-action" href="/companies/@CompanyId/workplaces/@workplace.WorkplaceId">
-                        @workplace.Name @(!string.IsNullOrWhiteSpace(workplace.Description) ? $"- {workplace.Description}" : "")
-                    </a>
-                }
-            </ul>
-        }
+<div class="row bg-light border border-1 rounded-2">
+    <div class="col">
+        <h2>@_company.Name</h2>
     </div>
+</div> 
+<div class="row">
+    <WorkplaceListComponent CompanyId="@CompanyId" Workplaces="@_workplaces" />
 </div>
\ No newline at end of file
diff --git a/Wonky.Client/Pages/WorkplaceListPage.razor.cs b/Wonky.Client/Pages/WorkplaceListPage.razor.cs
index 524c5533..04817040 100644
--- a/Wonky.Client/Pages/WorkplaceListPage.razor.cs
+++ b/Wonky.Client/Pages/WorkplaceListPage.razor.cs
@@ -37,9 +37,11 @@ public partial class WorkplaceListPage : IDisposable
         _interceptor.RegisterEvent();
         _interceptor.RegisterBeforeSendEvent();
         _company = await _companyRepo.GetCompanyById(CompanyId);
+    }
+
+    protected override async Task OnInitializedAsync()
+    {
         _workplaces = await _workplaceRepo.GetWorkplaces(CompanyId);
-        
-        Console.WriteLine(JsonSerializer.Serialize(_workplaces));
     }
 
     public void Dispose()
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 5e882a85..ddd18cdd 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -7,7 +7,7 @@
         "image": "grumpy-coder.png"
     },
     "apiConfig": {
-        "innoBaseUrl": "https://app.innotec.dk",
+        "innoBaseUrl": "https://staging.innotec.dk",
         "glsTrackUrl": "https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DK01/DA/5004.htm?txtAction=71000&txtRefNo=",
         "glsId": "",
         "serviceVirk": "api/v2/services/virk",