diff --git a/pfosten/app/Http/Controllers/UsersController.php b/pfosten/app/Http/Controllers/UsersController.php
index 2efa8f23..ae4fe00d 100755
--- a/pfosten/app/Http/Controllers/UsersController.php
+++ b/pfosten/app/Http/Controllers/UsersController.php
@@ -279,7 +279,7 @@ class UsersController extends Controller
 
         Payment::set_payment_date(request('id'), $season_id, request('paid'));
 
-        Tipp::createAllTips();
+        //Tipp::createAllTips();
 
         Log::info($a->getEndMessage());
         //error_log($a->getEndMessage());
diff --git a/pfosten/resources/views/tipps/edit4.blade.php b/pfosten/resources/views/tipps/edit4.blade.php
index 816090e2..6186a16d 100644
--- a/pfosten/resources/views/tipps/edit4.blade.php
+++ b/pfosten/resources/views/tipps/edit4.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.layout')
 
 @section('content')
-    <div>
+    <div class="container">
 
         <h1>{{$round->name}}</h1>
 
@@ -26,9 +26,9 @@
 
                     <span >
                         @if (App\Round::hasLockedGame($game1->round_id))
-                            {{ Form::checkbox('joker', 'yes',  $tipp1->joker, array('disabled') ) }} <!-- name, value, checked -->
+                            {{ Form::checkbox('joker_1', 'yes',  $tipp1->joker, array('disabled') ) }} <!-- name, value, checked -->
                         @else
-                            {{ Form::checkbox('joker', 'yes',  $tipp1->joker) }} <!-- name, value, checked -->
+                            {{ Form::checkbox('joker_1', 'yes',  $tipp1->joker) }} <!-- name, value, checked -->
                         @endif
                     </span>
                     <input type="hidden" name="tipp_id_1" value="{{ $tipp1->id }}">
@@ -55,9 +55,9 @@
 
                     <span >
                         @if (App\Round::hasLockedGame($game2->round_id))
-                            {{ Form::checkbox('joker', 'yes',  $tipp2->joker, array('disabled') ) }} <!-- name, value, checked -->
+                            {{ Form::checkbox('joker_2', 'yes',  $tipp2->joker, array('disabled') ) }} <!-- name, value, checked -->
                         @else
-                            {{ Form::checkbox('joker', 'yes',  $tipp2->joker) }} <!-- name, value, checked -->
+                            {{ Form::checkbox('joker_2', 'yes',  $tipp2->joker) }} <!-- name, value, checked -->
                             @endif
                     </span>
                     <input type="hidden" name="tipp_id_2" value="{{ $tipp2->id }}">
@@ -80,9 +80,9 @@
 
                     <span >
                         @if (App\Round::hasLockedGame($game3->round_id))
-                            {{ Form::checkbox('joker', 'yes',  $tipp3->joker, array('disabled') ) }} <!-- name, value, checked -->
+                            {{ Form::checkbox('joker_3', 'yes',  $tipp3->joker, array('disabled') ) }} <!-- name, value, checked -->
                         @else
-                            {{ Form::checkbox('joker', 'yes',  $tipp3->joker) }} <!-- name, value, checked -->
+                            {{ Form::checkbox('joker_3', 'yes',  $tipp3->joker) }} <!-- name, value, checked -->
                             @endif
                     </span>
                     <input type="hidden" name="tipp_id_3" value="{{ $tipp3->id }}">
@@ -104,15 +104,97 @@
 
                     <span >
                         @if (App\Round::hasLockedGame($game4->round_id))
-                            {{ Form::checkbox('joker', 'yes',  $tipp4->joker, array('disabled') ) }} <!-- name, value, checked -->
+                            {{ Form::checkbox('joker_4', 'yes',  $tipp4->joker, array('disabled') ) }} <!-- name, value, checked -->
                         @else
-                            {{ Form::checkbox('joker', 'yes',  $tipp4->joker) }} <!-- name, value, checked -->
+                            {{ Form::checkbox('joker_4', 'yes',  $tipp4->joker) }} <!-- name, value, checked -->
                             @endif
                     </span>
                     <input type="hidden" name="tipp_id_4" value="{{ $tipp4->id }}">
                     <input type="hidden" name="game_id_4" value="{{ $game4->id }}">
 
 
+
+                    <br/>
+                    <br/>
+                    <br/>
+
+                    <p>&nbsp;
+                        <h3>Joker setzen auf:</h3>
+
+
+                        <fieldset>
+                            @if (App\Round::hasLockedGame($game1->round_id))
+                                <input type="radio" id="joker_1" name="joker" value="joker_1" onclick="return false;"
+                                @if($game1->joker)
+                                    checked="checked"
+                                @endif
+                                >
+                            @else
+                                <input type="radio" id="joker_1" name="joker" value="joker_1"
+                                       @if($game1->joker)
+                                       checked="checked"
+                                        @endif
+                                >
+                            @endif
+
+                            <label for="joker_1"> {{ $game1->team1 }} : {{ $game1->team2 }}</label>
+                            <br/>
+
+
+                                @if (App\Round::hasLockedGame($game2->round_id))
+                                    <input type="radio" id="joker_2" name="joker" value="joker_2" onclick="return false;"
+                                           @if($game2->joker)
+                                            checked="checked"
+                                           @endif
+                                    >
+                                @else
+                                    <input type="radio" id="joker_2" name="joker" value="joker_2"
+                                           @if($game2->joker)
+                                            checked="checked"
+                                           @endif
+                                    >
+                                @endif
+
+
+                            <label for="joker_2"> {{ $game2->team1 }} : {{ $game2->team2 }}</label>
+                            <br/>
+
+                                @if (App\Round::hasLockedGame($game3->round_id))
+                                    <input type="radio" id="joker_3" name="joker" value="joker_3" onclick="return false;"
+                                           @if($game3->joker)
+                                           checked="checked"
+                                            @endif
+                                    >
+                                @else
+                                    <input type="radio" id="joker_3" name="joker" value="joker_3"
+                                           @if($game3->joker)
+                                           checked="checked"
+                                            @endif
+                                    >
+                                @endif
+
+
+                            <label for="joker_3"> {{ $game3->team1 }} : {{ $game3->team2 }}</label>
+                            <br/>
+
+
+                                @if (App\Round::hasLockedGame($game4->round_id))
+                                    <input type="radio" id="joker_4" name="joker" value="joker_4" onclick="return false;"
+                                           @if($game4->joker)
+                                           checked="checked"
+                                            @endif
+                                    >
+                                @else
+                                    <input type="radio" id="joker_4" name="joker" value="joker_4"
+                                           @if($game4->joker)
+                                           checked="checked"
+                                            @endif
+                                    >
+                                @endif
+                            <label for="joker_4"> {{ $game4->team1 }} : {{ $game4->team2 }}</label>
+                        </fieldset>
+                    </p>
+
                 <div class="form-group">
                     <p>&nbsp;</p>
                     <button type="submit" class="btn btn-primary">Ok</button>
@@ -123,4 +205,6 @@
 
 
      </div>
+
+
 @endsection
\ No newline at end of file