diff --git a/Wonky.Client/Components/ActivityButton.razor b/Wonky.Client/Components/ActivityButton.razor
index e70bbd29..d4c963c1 100644
--- a/Wonky.Client/Components/ActivityButton.razor
+++ b/Wonky.Client/Components/ActivityButton.razor
@@ -25,9 +25,15 @@ else
 }
 
 @code {
+    [Parameter]public string CompanyId { get; set; } = "";
     [Parameter] public int Enabled { get; set; }
     [Parameter] public string ButtonType { get; set; } = "primary";
     [Parameter] public string ButtonText { get; set; } = "Tag Mig";
     [Parameter] public string ActionLink { get; set; } = "#";
 
+    protected override void OnParametersSet()
+    {
+        ActionLink = ActionLink.Replace("$ID$", CompanyId);
+    }
+
 }
\ No newline at end of file
diff --git a/Wonky.Client/Components/ColorCoding.razor b/Wonky.Client/Components/ColorCoding.razor
index 171d9167..804ba52a 100644
--- a/Wonky.Client/Components/ColorCoding.razor
+++ b/Wonky.Client/Components/ColorCoding.razor
@@ -17,7 +17,7 @@
 
 <table class="table">
     <thead>
-    <tr>
+    <tr class="bg-black bg-opacity-50 text-white">
         <th scope="col">Farvekode</th>
         <th scope="col">Betydning</th>
     </tr>
diff --git a/Wonky.Client/Components/CompanyTableComponent.razor b/Wonky.Client/Components/CompanyTableComponent.razor
index 478abcb9..4ad49faf 100644
--- a/Wonky.Client/Components/CompanyTableComponent.razor
+++ b/Wonky.Client/Components/CompanyTableComponent.razor
@@ -64,7 +64,11 @@
                         @company.City
                     </div>
                     <div class="col">
-                        <ActivityButton CompanyId="@company.CompanyId" Enabled="@company.ValidVat"></ActivityButton>
+                        <ActivityButton CompanyId="@company.CompanyId"
+                                        ActionLink="/companies/$ID$/activity/new"
+                                        ButtonText="Besøg"
+                                        ButtonType="primary"
+                                        Enabled="@company.ValidVat"></ActivityButton>
                     </div>
                 </div>
             </a>
diff --git a/Wonky.Client/Components/CompanyTableComponent.razor.cs b/Wonky.Client/Components/CompanyTableComponent.razor.cs
index a9056310..f03ae6f7 100644
--- a/Wonky.Client/Components/CompanyTableComponent.razor.cs
+++ b/Wonky.Client/Components/CompanyTableComponent.razor.cs
@@ -32,17 +32,19 @@ namespace Wonky.Client.Components
 
         private Confirmation _confirmation = new ();
         private string _companyId = "";
+        private string _actionUrl = "";
 
         protected override async Task OnInitializedAsync()
         {
             await base.OnInitializedAsync();
         }
+        
         private void CallConfirmationModal(string companyId)
         {
             _companyId = companyId;
             _confirmation.Show();
         }
-
+        
         private async Task DeleteCompany()
         {
             _confirmation.Hide();
diff --git a/Wonky.Client/Pages/ActivityVisitNew.razor b/Wonky.Client/Pages/ActivityVisitNew.razor
index a86230a7..1b53f718 100644
--- a/Wonky.Client/Pages/ActivityVisitNew.razor
+++ b/Wonky.Client/Pages/ActivityVisitNew.razor
@@ -357,7 +357,7 @@
             <a class="btn btn-warning" href="/companies/@_company.CompanyId">Annuller</a>
         </div>
         <div class="col">
-            <button type="button" class="btn btn-primary" @onclick="CreateActivity">Opret besøg</button>
+            <button type="button" class="btn btn-primary" @onclick="CreateActivity" disabled="@_poFormInvalid">Opret besøg</button>
         </div>
     </div>
 </div>
diff --git a/Wonky.Client/Pages/ActivityVisitNew.razor.cs b/Wonky.Client/Pages/ActivityVisitNew.razor.cs
index 2bfe92b2..0ed74c12 100644
--- a/Wonky.Client/Pages/ActivityVisitNew.razor.cs
+++ b/Wonky.Client/Pages/ActivityVisitNew.razor.cs
@@ -64,10 +64,10 @@ public partial class ActivityVisitNew : IDisposable
     private string Price = "0";
     private string Discount = "0";
     private bool Sas;
-    private bool InvalidActivityType { get; set; } = true;
-    private bool InvalidStatusType { get; set; } = true;
-    private bool InvalidActivity { get; set; } = true;
-    private bool InvalidCanvas { get; set; } = true;
+    private bool InvalidActivityType = true;
+    private bool InvalidStatusType = true;
+    private bool InvalidActivity  = true;
+    private bool InvalidCanvas = true;
     private bool _reportClosdd { get; set; } = false;
     private UserInfoView Ux { get; set; } = new();
     private DateTime _workDate { get; set; } = DateTime.Now;
@@ -147,7 +147,7 @@ public partial class ActivityVisitNew : IDisposable
     {
         HideButtons = true;
         _draft.ActivityDate = _prefs.WorkDate;
-        
+            
         var activityType = _draft.ActivityTypeEnum switch
         {
             "phone" => "T:",
@@ -275,16 +275,16 @@ public partial class ActivityVisitNew : IDisposable
     private void HandleFieldChanged(object sender, FieldChangedEventArgs e)
     {
         // InvalidCanvas = InvalidActivityType;
-        // InvalidActivity = InvalidActivityType 
-        //                   || _poFormInvalid 
-        //                   || DraftStateProvider.Draft.Items.Count == 0 
-        //                   || (_poDraft.ActivityStatusEnum == "offer" && string.IsNullOrWhiteSpace(_poDraft.EMail));
+        InvalidActivity = InvalidActivityType 
+                           || _poFormInvalid 
+                           || DraftStateProvider.Draft.Items.Count == 0 
+                           || (_draft.ActivityStatusEnum == "offer" && string.IsNullOrWhiteSpace(_draft.EMail));
         
-        // if (InvalidCanvas || InvalidActivity)
-        // {
-        //     _poFormInvalid = true;
-        //     return;
-        // }
+        if (InvalidActivity)
+        {
+             _poFormInvalid = true;
+             return;
+        }
 
         _poFormInvalid = !_editContext.Validate();
         StateHasChanged();