diff --git a/web/pages/dogs/controller.php b/web/pages/dogs/controller.php
index 5d89e69..e3cce46 100644
--- a/web/pages/dogs/controller.php
+++ b/web/pages/dogs/controller.php
@@ -209,12 +209,12 @@ class Dogs extends Page {
     {
         $dogid = $this->params[0];
         $d = new Dog();
-        $res = new Result();
 
-        if(!$d->isMyDog($dogid))
-            return 'Not your dog :(';
+        //if(!$d->isMyDog($dogid))
+        //    return 'Not your dog :(';
         
         $d->load($dogid);
+        $this->set('ismydog',$d->isMyDog($dogid));
         $this->set('results', $d->getResults());
         $this->set('dogdata', $d->data);
         $this->set('dogid', $dogid);
diff --git a/web/pages/dogs/dog.html.php b/web/pages/dogs/dog.html.php
index 8a74f14..eca80a1 100644
--- a/web/pages/dogs/dog.html.php
+++ b/web/pages/dogs/dog.html.php
@@ -37,11 +37,13 @@
                         <?php endif; ?>
                     </ul>
 
+                    <?php if($ismydog===true): ?>
                     <div class="d-flex justify-content-end">
                         <button type="button" class="btn btn-secondary" hx-get="/dogs/edit/<?= $dogid; ?>" hx-target="#main">
                             <i class="fas fa-edit"></i>
                         </button>
                     </div>
+                    <?php endif; ?>
                 </div>
             </div>
         </div>
@@ -68,71 +70,81 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <?php foreach($results as $result) : ?>
-                            <?php  
-                        $t = new Tournament();
-                        $run = new Run();
+                            <?php if(count($results) > 0): ?>
+                                <?php foreach($results as $result) : ?>
+                                <?php  
+                            $t = new Tournament();
+                            $run = new Run();
 
-                        $tname = $t->getField('name',$result['tournament']);
-                        $tdate = $t->getField('date',$result['tournament']);
-                        $rname = $run->getField('name',$result['run']);
+                            $tname = $t->getField('name',$result['tournament']);
+                            $tdate = $t->getField('date',$result['tournament']);
+                            $rname = $run->getField('name',$result['run']);
 
-                        $sdata['dates'][] = $tdate;
+                            $sdata['dates'][] = $tdate;
 
-                        $sdata['speed'][] = $result['speed'];
-                        $sdata['errors'][] = $result['errors'];
-                        $sdata['refusals'][] = $result['refusals'];
-                        $sdata['time'][] = $result['runtime'];
-                        $sdata['points'][] = $result['points'];
-                        $sdata['rating'][] = $result['rating'];
+                            $sdata['speed'][] = $result['speed'];
+                            $sdata['errors'][] = $result['errors'];
+                            $sdata['refusals'][] = $result['refusals'];
+                            $sdata['time'][] = $result['runtime'];
+                            $sdata['points'][] = $result['points'];
+                            $sdata['rating'][] = $result['rating'];
 
-                        //'Geschwindigkeit', 'Fehler', 'Verweigerungen', 'Zeit', 'Punkte','Platz'
+                            //'Geschwindigkeit', 'Fehler', 'Verweigerungen', 'Zeit', 'Punkte','Platz'
 
-                        ?>
+                            ?>
+                                <tr>
+                                    <td><a href="/tournaments/event/<?= $result['tournament']; ?>">
+                                            <?= $tname; ?>
+                                        </a></td>
+                                    <td><a href="/runs/overview/<?= $result['run']; ?>">
+                                            <?= $rname; ?>
+                                        </a></td>
+                                    <td>
+                                        <?= escape($result['ranking']); ?>
+                                    </td>
+                                    <td>
+                                        <?= $result['disqualified']?'Ja':'Nein'; ?>
+                                    </td>
+                                    <td>
+                                        <?= escape($result['refusals']); ?>
+                                    </td>
+                                    <td>
+                                        <?= escape($result['errors']); ?>
+                                    </td>
+                                    <td>
+                                        <?= escape($result['timefaults']); ?>
+                                    </td>
+                                    <td>
+                                        <?= escape($result['runtime']); ?>
+                                    </td>
+                                    <td>
+                                        <?= escape($result['penalties']); ?>
+                                    </td>
+                                    <td>
+                                        <?= escape($result['speed']); ?>
+                                    </td>
+                                    <td>
+                                        <?= escape($result['rating']); ?>
+                                    </td>
+                                    <td><a href="/dogs/overview/<?= $result['dog'] ?>">
+                                            <?= escape( (new Dog())->getField('name',$result['dog']) ); ?>
+                                        </a></td>
+                                </tr>
+                                <?php endforeach; ?>
+                            <?php else: ?>
                             <tr>
-                                <td><a href="/tournaments/event/<?= $result['tournament']; ?>">
-                                        <?= $tname; ?>
-                                    </a></td>
-                                <td><a href="/runs/overview/<?= $result['run']; ?>">
-                                        <?= $rname; ?>
-                                    </a></td>
-                                <td>
-                                    <?= escape($result['ranking']); ?>
+                                <td colspan="12">
+                                    <div class="alert alert-info" role="alert">
+                                        <i class="fas fa-info-circle"></i> Dieser Hund hat noch keine Ergebnisse
+                                    </div>
                                 </td>
-                                <td>
-                                    <?= $result['disqualified']?'Ja':'Nein'; ?>
-                                </td>
-                                <td>
-                                    <?= escape($result['refusals']); ?>
-                                </td>
-                                <td>
-                                    <?= escape($result['errors']); ?>
-                                </td>
-                                <td>
-                                    <?= escape($result['timefaults']); ?>
-                                </td>
-                                <td>
-                                    <?= escape($result['runtime']); ?>
-                                </td>
-                                <td>
-                                    <?= escape($result['penalties']); ?>
-                                </td>
-                                <td>
-                                    <?= escape($result['speed']); ?>
-                                </td>
-                                <td>
-                                    <?= escape($result['rating']); ?>
-                                </td>
-                                <td><a href="/dogs/overview/<?= $result['dog'] ?>">
-                                        <?= escape( (new Dog())->getField('name',$result['dog']) ); ?>
-                                    </a></td>
-                            </tr>
-                            <?php endforeach; ?>
+                            <?php endif; ?>
                         </tbody>
                     </table>
                 </div>
             </div>
 
+            <?php if(count($results) > 0): ?>
             <div class="col">
                 <div id="graph" data-bs-theme="light" class="card bg-light text-black" style="min-height: 400px;"></div>
 
@@ -214,6 +226,6 @@
                     myChart.setOption(option);
                 </script>
             </div>
-
+            <?php endif; ?>
         </div>
     </div>
\ No newline at end of file