diff --git a/KoogleApp/Components/Controls/BellButton.razor b/KoogleApp/Components/Controls/BellButton.razor
index e4498bc..eb39beb 100644
--- a/KoogleApp/Components/Controls/BellButton.razor
+++ b/KoogleApp/Components/Controls/BellButton.razor
@@ -9,7 +9,7 @@
 
 <MudButton OnClick="ToggleClick" Disabled="false">
     <MudIcon Class="ma-2" Icon="@Icons.Material.Filled.AddAlert"
-             Color="@(State.Value.BellValue ? Color.Primary : Color.Warning)"
+             Color="@(State.Value.BellValue ? Color.Warning : Color.Primary)"
              Style="font-size: 3rem;"/>
 </MudButton>
 
diff --git a/KoogleApp/Components/Controls/NumberPanel.razor b/KoogleApp/Components/Controls/NumberPanel.razor
index 32a96f0..ce279aa 100644
--- a/KoogleApp/Components/Controls/NumberPanel.razor
+++ b/KoogleApp/Components/Controls/NumberPanel.razor
@@ -25,7 +25,7 @@
         <MudItem xs="4">
             <MudPaper Class="d-flex align-center justify-center mud-width-full py-0" Style="height: 76px;">
                 <MudStack Spacing="0" Wrap="Wrap.Wrap">
-                    <MudChip T="string" Color="Color.Dark" Size="Size.Small">in die Vollen</MudChip>
+                    <MudChip T="string" Color="Color.Dark" Size="Size.Small">@(GetThrowModeName(ThrowPanelState.Value.ThrowMode))</MudChip>
                     <MudChip T="string" Color="Color.Dark" Size="Size.Small">Wurf 1 von 1</MudChip>
                 </MudStack>
             </MudPaper>
@@ -153,4 +153,18 @@
     {
         Dispatcher.Dispatch(new UpdatePinStateByNumberAction(number));
     }
+
+    private string GetThrowModeName(ThrowMode value)
+    {
+        switch (value)
+        {
+            case ThrowMode.Reposition:
+                return "Abräumen";
+            case ThrowMode.Decrease:
+                return "in die Vollen";
+            default:
+                throw new ArgumentOutOfRangeException(nameof(value), value, null);
+        }
+    }
+
 }
diff --git a/KoogleApp/Components/Dialogs/StartGameDialog.razor b/KoogleApp/Components/Dialogs/StartGameDialog.razor
index ea17341..07c8e68 100644
--- a/KoogleApp/Components/Dialogs/StartGameDialog.razor
+++ b/KoogleApp/Components/Dialogs/StartGameDialog.razor
@@ -38,10 +38,10 @@
         }
     }
 
+
     [CascadingParameter]
     private IMudDialogInstance MudDialog { get; set; }
 
-    // [Parameter]
     private Tuple<string, ThrowMode> _valueThrowMode;
 
     [Parameter]
@@ -57,18 +57,4 @@
             MudDialog.Close(DialogResult.Ok(new StartParams(_valueThrowMode.Item2, 3)));
         }
     }
-
-    private string ValueToString(ThrowMode item)
-    {
-        switch (item)
-        {
-            case ThrowMode.Reposition:
-                return "Abräumen";
-            case ThrowMode.Decrease:
-                return "in die Vollen";
-            default:
-                throw new ArgumentOutOfRangeException(nameof(item), item, null);
-        }
-    }
-
 }
diff --git a/KoogleApp/Store/Game/ThrowPanel/Reducers.cs b/KoogleApp/Store/Game/ThrowPanel/Reducers.cs
index af83287..a19df26 100644
--- a/KoogleApp/Store/Game/ThrowPanel/Reducers.cs
+++ b/KoogleApp/Store/Game/ThrowPanel/Reducers.cs
@@ -43,13 +43,14 @@ namespace KoogleApp.Store.Game.ThrowPanel
         [ReducerMethod]
         public static ThrowPanelState OnStartStop(ThrowPanelState state, StartStopAction startStopAction)
         {
+            var newState = new ThrowPanelState();
             if (state.IsStated)
             {
-                return state with { IsStated = false };
+                return newState with { IsStated = false };
             }
 
             if (startStopAction.StartParams != null)
-                return state with
+                return newState with
                 {
                     IsStated = !state.IsStated,
                     ThrowMode = startStopAction.StartParams.ThrowMode,
diff --git a/KoogleApp/ThrowPanelState.json b/KoogleApp/ThrowPanelState.json
index fb3e902..ecc7224 100644
--- a/KoogleApp/ThrowPanelState.json
+++ b/KoogleApp/ThrowPanelState.json
@@ -2,14 +2,14 @@
   "IsStated": true,
   "BellValue": false,
   "Pin1Value": true,
-  "Pin2Value": true,
+  "Pin2Value": false,
   "Pin3Value": true,
-  "Pin4Value": true,
+  "Pin4Value": false,
   "Pin5Value": true,
   "Pin6Value": true,
-  "Pin7Value": true,
-  "Pin8Value": true,
-  "Pin9Value": true,
+  "Pin7Value": false,
+  "Pin8Value": false,
+  "Pin9Value": false,
   "Pin1Disabled": false,
   "Pin2Disabled": false,
   "Pin3Disabled": false,
@@ -21,5 +21,5 @@
   "Pin9Disabled": false,
   "ThrowsPerRound": 3,
   "ThrowCounter": 0,
-  "ThrowMode": 0
+  "ThrowMode": 1
 }
\ No newline at end of file