diff --git a/src/structure/components/com_sportsmanager/admin.php b/src/structure/components/com_sportsmanager/admin.php
index e1740c4..5687e51 100644
--- a/src/structure/components/com_sportsmanager/admin.php
+++ b/src/structure/components/com_sportsmanager/admin.php
@@ -3915,6 +3915,9 @@ function adminEditSpielort(): void
     $ortsname = $db->escape(trim($jInput->get('ortsname', '', 'RAW')));
     $ortsteil = $db->escape(trim($jInput->get('ortsteil', '', 'RAW')));
     $url = $db->escape(trim($jInput->get('url', '', 'RAW')));
+	$telefon = $db->escape(trim($jInput->get('telefon', '', 'RAW')));
+	$email = $db->escape(trim($jInput->get('email', '', 'RAW')));
+	$ruhetage = $db->escape(trim($jInput->get('ruhetage', '', 'RAW')));
     $beschreibung = $db->escape(trim($jInput->get('beschreibung', '', 'RAW')));
     $status = $jInput->get('status', 0, 'INT');
 
@@ -3923,8 +3926,8 @@ function adminEditSpielort(): void
     }
 
     if ($id == 0) {
-        $query = "INSERT INTO #__sportsmanager_spielort (name, strasse, plz, ortsname, ortsteil, url, beschreibung, status)"
-            . "\n VALUES ('$name', '$strasse', '$plz', '$ortsname', '$ortsteil', '$url', '$beschreibung', '$status');";
+        $query = "INSERT INTO #__sportsmanager_spielort (name, strasse, plz, ortsname, ortsteil, url, telefon, email, ruhetage, beschreibung, status)"
+            . "\n VALUES ('$name', '$strasse', '$plz', '$ortsname', '$ortsteil', '$url', '$telefon', '$email', '$ruhetage', '$beschreibung', '$status');";
         $db->setQuery($query);
         if (!$db->execute()) {
             die($db->stderr(true));
@@ -3938,6 +3941,9 @@ function adminEditSpielort(): void
             . "\n ortsname = '$ortsname',"
             . "\n ortsteil = '$ortsteil',"
             . "\n url = '$url',"
+            . "\n telefon = '$telefon',"
+            . "\n email = '$email',"
+            . "\n ruhetage = '$ruhetage',"
             . "\n beschreibung = '$beschreibung',"
             . "\n status = '$status'"
             . "\n WHERE spielort_id = $id";
@@ -7944,6 +7950,7 @@ function adminEditMannschaft(): void
     $heimspiel_wochentag = $jInput->get('heimspiel_wochentag', 0, 'INT');
     $heimspiel_uhrzeit = sprintf("%02d%02d", $jInput->get('heimspiel_uhrzeit_stunden', 0, 'INT'), $jInput->get('heimspiel_uhrzeit_minuten', 0, 'INT'));
     $heimspielort_id = $jInput->get('heimspielort_id', 0, 'INT');
+	$trainingstage = $db->escape(trim($jInput->get('trainingstage', '', 'RAW')));
     $nichtraucherschutz = $jInput->get('nichtraucherschutz', 0, 'INT');
     $zusatzpunkte = $jInput->get('zusatzpunkte', 0, 'FLOAT');
     $bildbeibehalten = $jInput->get('bildbeibehalten', 0, 'INT');
@@ -7970,8 +7977,8 @@ function adminEditMannschaft(): void
     $veranstaltung = $rows[0];
 
     if ($id == 0) {
-        $query = "INSERT INTO #__sportsmanager_team (verein_id, veranstaltung_id, teamname, teamname_kurz, tischtyp, tischeigenschaften, heimspiel_wochentag, heimspiel_uhrzeit, heimspielort_id, nichtraucherschutz, zusatzpunkte" . ($veranstaltung->tabellenwertung == -2 ? ", platz" : "") . ", pin)"
-            . "\n VALUES (" . ($verein_id != 0 ? "'$verein_id'" : "NULL") . ", '$veranstaltungId', '$teamname', '$teamname_kurz', '$tischtyp', '$tischeigenschaften', '$heimspiel_wochentag', '$heimspiel_uhrzeit', " . ($heimspielort_id != 0 ? "'$heimspielort_id'" : "NULL") . ", '$nichtraucherschutz', '$zusatzpunkte'" . ($veranstaltung->tabellenwertung == -2 ? ($platz != 0 ? ", '$platz'" : ", NULL") : "") . ", '$pin');";
+        $query = "INSERT INTO #__sportsmanager_team (verein_id, veranstaltung_id, teamname, teamname_kurz, tischtyp, tischeigenschaften, heimspiel_wochentag, heimspiel_uhrzeit, heimspielort_id, trainingstage, nichtraucherschutz, zusatzpunkte" . ($veranstaltung->tabellenwertung == -2 ? ", platz" : "") . ", pin)"
+            . "\n VALUES (" . ($verein_id != 0 ? "'$verein_id'" : "NULL") . ", '$veranstaltungId', '$teamname', '$teamname_kurz', '$tischtyp', '$tischeigenschaften', '$heimspiel_wochentag', '$heimspiel_uhrzeit', " . ($heimspielort_id != 0 ? "'$heimspielort_id'" : "NULL") . ", '$trainingstage', '$nichtraucherschutz', '$zusatzpunkte'" . ($veranstaltung->tabellenwertung == -2 ? ($platz != 0 ? ", '$platz'" : ", NULL") : "") . ", '$pin');";
 		$db->setQuery($query);
         if (!$db->execute()) {
             die($db->stderr(true));
@@ -7999,6 +8006,7 @@ function adminEditMannschaft(): void
             . "\n heimspiel_wochentag = '$heimspiel_wochentag',"
             . "\n heimspiel_uhrzeit = '$heimspiel_uhrzeit',"
             . "\n heimspielort_id = " . ($heimspielort_id != 0 ? "'$heimspielort_id'" : "NULL") . ","
+			. "\n trainingstage = '$trainingstage',"
             . "\n nichtraucherschutz = '$nichtraucherschutz',"
             . ($veranstaltung->tabellenwertung == -2 ? ($platz != 0 ? "\n platz = '$platz'," : "\n platz = NULL,") : "")
             . "\n zusatzpunkte = '$zusatzpunkte',"
diff --git a/src/structure/components/com_sportsmanager/database/update.php b/src/structure/components/com_sportsmanager/database/update.php
index 1cf2d45..0127c0a 100644
--- a/src/structure/components/com_sportsmanager/database/update.php
+++ b/src/structure/components/com_sportsmanager/database/update.php
@@ -5541,6 +5541,33 @@ function updateDatabase(): void
         }
     }
 	
+    if ($datenbank_version < 116) {
+
+		$query = "ALTER TABLE `#__sportsmanager_spielort`"
+			. "\n ADD IF NOT EXISTS `telefon` VARCHAR(64) NULL DEFAULT NULL AFTER `url`,"
+			. "\n ADD IF NOT EXISTS `email` VARCHAR(64) NULL DEFAULT NULL AFTER `telefon`,"
+			. "\n ADD IF NOT EXISTS `ruhetage` VARCHAR(64) NULL DEFAULT NULL AFTER `email`;";
+        $db->setQuery($query);
+        if (!$db->execute()) {
+            die($db->stderr(true));
+        }
+		
+        $query = "ALTER TABLE `#__sportsmanager_team`"
+			. "\n ADD IF NOT EXISTS `trainingstage` VARCHAR(64) NULL DEFAULT NULL AFTER `heimspielort_id`;";
+        $db->setQuery($query);
+        if (!$db->execute()) {
+            die($db->stderr(true));
+        }
+		
+        $query = "UPDATE #__sportsmanager_einstellungen"
+            . "\n SET wert = '116'"
+            . "\n WHERE name = 'datenbank_version'";
+        $db->setQuery($query);
+        if (!$db->execute()) {
+            die($db->stderr(true));
+        }
+    }
+	
     if ($termin_aktionen_email_setzen) {
         $query = "SELECT aktion_user_id, termin_aktion_id"
             . "\n FROM #__sportsmanager_termin_aktion";
diff --git a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php
index 225fa8d..cc2ce08 100644
--- a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php
+++ b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php
@@ -4022,13 +4022,15 @@ class HTML_sportsmanager_admin
 
         if (count($vereinsmitglieder) > 0) {
             ?>
+			<div class="uk-overflow-auto">
             <table class="contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>">
                 <tr class="sectiontableheader<?php echo $params->get('pageclass_sfx'); ?>">
-                    <th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_LAST_NAME'); ?></strong></th>
-                    <th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_FIRST_NAME'); ?> </strong></th>
-                    <th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_FIRST_NAME'); ?></strong></th>
-                    <th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_MEMBER_STATUS'); ?></strong></th>
-                </tr>
+                    <th style="width: 200px; text-align: left;" nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_LAST_NAME'); ?></strong></th>
+                    <th style="width: 200px; text-align: left;" nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_FIRST_NAME'); ?> </strong></th>
+                    <th style="width: 150px; text-align: left;" nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_PLAYER_NUMBER_SHORT'); ?></strong></th>
+                    <th style="width: 150px; text-align: left;" nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_STATUS'); ?></strong></th>
+					<th style="width: 100px;"></th>
+				</tr>
                 <?php
 
                 $k = 0;
@@ -4058,6 +4060,7 @@ class HTML_sportsmanager_admin
                 }
                 ?>
             </table>
+			</div>
             <?php
         }
     }
@@ -4277,100 +4280,125 @@ class HTML_sportsmanager_admin
         <form action="<?php echo SportsManagerURL(($row != null ? ('#id' . $row->spielort_id) : "")); ?>" method="post"
               name="adminForm" id="adminForm" enctype="multipart/form-data">
             <div class="uk-overflow-auto">
-                <table class="uk-table" style="width: 100%">
-                    <tr>
-                        <td nowrap style="width: 60%; vertical-align: top">
-                            <div class="uk-overflow-auto">
-                                <table class="uk-table" style="width: 100%">
-                                    <tr>
-                                        <td nowrap style="width: 20%; text-align: right">
-                                            <label for="name"><?php echo Text::_('COM_SPORTSMANAGER_NAME'); ?>:</label>
-                                        </td>
-                                        <td nowrap>
-                                            <input class="inputbox" type="text" name="name" id="name" size="50"
-                                                   maxlength="50"
-                                                   value="<?php if ($row != null) echo htmlentities_utf8($row->name); ?>"/>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td nowrap style="width: 20%; text-align: right">
-                                            <label for="street"><?php echo Text::_('COM_SPORTSMANAGER_STREET'); ?>
-                                                :</label>
-                                        </td>
-                                        <td nowrap>
-                                            <input class="inputbox" type="text" name="strasse" id="street" size="50"
-                                                   maxlength="30"
-                                                   value="<?php if ($row != null) if ($row->strasse != null) echo htmlentities_utf8($row->strasse); ?>"/>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td nowrap style="width: 20%; text-align: right">
-                                            <label
-                                                for="zip"><?php echo Text::_('COM_SPORTSMANAGER_PLACE_SHORTCUT2'); ?></label>
-                                            / <label
-                                                for="location"><?php echo Text::_('COM_SPORTSMANAGER_PLACE'); ?></label>
-                                            / <label for="district"><?php echo Text::_('COM_SPORTSMANAGER_DISTRICT'); ?>
-                                                :</label>
-                                        </td>
-                                        <td nowrap>
-                                            <input class="inputbox" type="text" name="plz" id="zip" size="5"
-                                                   maxlength="6"
-                                                   value="<?php if ($row != null) echo htmlentities_utf8($row->plz); ?>"/>
-                                            <input class="inputbox" type="text" name="ortsname" id="location" size="28"
-                                                   maxlength="30"
-                                                   value="<?php if ($row != null) echo htmlentities_utf8($row->ortsname); ?>"/>
-                                            <input class="inputbox" type="text" name="ortsteil" id="district" size="21"
-                                                   maxlength="30"
-                                                   value="<?php if ($row != null) echo htmlentities_utf8($row->ortsteil); ?>"/>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td nowrap style="width: 20%; text-align: right">
-                                            <label for="url"><?php echo Text::_('COM_SPORTSMANAGER_WEBSITE'); ?>
-                                                :</label>
-                                        </td>
-                                        <td nowrap>
-                                            <input class="inputbox" type="text" name="url" id="url" size="50"
-                                                   maxlength="150"
-                                                   value="<?php if ($row != null) echo htmlentities_utf8($row->url); ?>"/>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td nowrap style="width: 20%; text-align: right; vertical-align: top">
-                                            <label
-                                                for="description"><?php echo Text::_('COM_SPORTSMANAGER_DESCRIPTION'); ?>
-                                                :</label>
-                                        </td>
-                                        <td nowrap>
-                                    <textarea name="beschreibung" id="description" cols="50"
-                                              rows="8"><?php if ($row != null) echo htmlentities_utf8($row->beschreibung); ?></textarea>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td nowrap style="width: 20%; text-align: right">
-                                            <label for="status"><?php echo Text::_('COM_SPORTSMANAGER_PUBLIC'); ?>
-                                                :</label>
-                                        </td>
-                                        <td nowrap>
-                                            <select class="uk-select uk-form-width-medium" name="status" id="status"
-                                                    size="1">
-                                                <?php
-                                                $status = array(Text::_('COM_SPORTSMANAGER_NO'), Text::_('COM_SPORTSMANAGER_YES'));
-                                                for ($i = 1; $i >= 0; $i--) {
-                                                    echo "<option value=\"" . $i . "\"" . ($row != null ? ($row->status == $i ? " selected" : "") : "") . ">" . htmlentities_utf8($status[$i]) . "</option>";
-                                                }
-                                                ?>
-                                            </select>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td nowrap colspan="2">&nbsp;
-                                        </td>
-                                    </tr>
-                                </table>
-                            </div>
-                        </td>
-                    </tr>
+                <table style="width: 100%">
+					<tr>
+						<td nowrap style="width: 20%; text-align: right">
+							<label for="name"><?php echo Text::_('COM_SPORTSMANAGER_NAME'); ?>:</label>
+						</td>
+						<td nowrap>
+							<input class="inputbox" type="text" name="name" id="name" size="64"
+								   maxlength="50"
+								   value="<?php if ($row != null) echo htmlentities_utf8($row->name); ?>"/>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right">
+							<label for="street"><?php echo Text::_('COM_SPORTSMANAGER_STREET'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+							<input class="inputbox" type="text" name="strasse" id="street" size="64"
+								   maxlength="30"
+								   value="<?php if ($row != null) if ($row->strasse != null) echo htmlentities_utf8($row->strasse); ?>"/>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right">
+							<label
+								for="zip"><?php echo Text::_('COM_SPORTSMANAGER_PLACE_SHORTCUT2'); ?></label>
+							/ <label
+								for="location"><?php echo Text::_('COM_SPORTSMANAGER_PLACE'); ?></label>
+							/ <label for="district"><?php echo Text::_('COM_SPORTSMANAGER_DISTRICT'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+							<input class="inputbox" type="text" name="plz" id="zip" size="5"
+								   maxlength="6"
+								   value="<?php if ($row != null) echo htmlentities_utf8($row->plz); ?>"/>
+							<input class="inputbox" type="text" name="ortsname" id="location" size="27"
+								   maxlength="30"
+								   value="<?php if ($row != null) echo htmlentities_utf8($row->ortsname); ?>"/>
+							<input class="inputbox" type="text" name="ortsteil" id="district" size="20"
+								   maxlength="30"
+								   value="<?php if ($row != null) echo htmlentities_utf8($row->ortsteil); ?>"/>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right">
+							<label for="url"><?php echo Text::_('COM_SPORTSMANAGER_WEBSITE'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+							<input class="inputbox" type="text" name="url" id="url" size="64"
+								   maxlength="150"
+								   value="<?php if ($row != null) echo htmlentities_utf8($row->url); ?>"/>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right">
+							<label for="phone"><?php echo Text::_('COM_SPORTSMANAGER_PHONE'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+							<input class="inputbox" type="text" name="telefon" id="phone" size="64"
+								   maxlength="64"
+								   value="<?php if ($row != null) echo htmlentities_utf8($row->telefon); ?>"/>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right">
+							<label for="email"><?php echo Text::_('COM_SPORTSMANAGER_EMAIL'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+							<input class="inputbox" type="text" name="email" id="email" size="64"
+								   maxlength="64"
+								   value="<?php if ($row != null) echo htmlentities_utf8($row->email); ?>"/>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right">
+							<label for="restdays"><?php echo Text::_('COM_SPORTSMANAGER_REST_DAYS'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+							<input class="inputbox" type="text" name="ruhetage" id="restdays" size="64"
+								   maxlength="64"
+								   value="<?php if ($row != null) echo htmlentities_utf8($row->ruhetage); ?>"/>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right; vertical-align: top">
+							<label
+								for="description"><?php echo Text::_('COM_SPORTSMANAGER_DESCRIPTION'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+					<textarea name="beschreibung" id="description" cols="60"
+							  rows="8"><?php if ($row != null) echo htmlentities_utf8($row->beschreibung); ?></textarea>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right">
+							<label for="status"><?php echo Text::_('COM_SPORTSMANAGER_PUBLIC'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+							<select class="uk-select uk-form-width-medium" name="status" id="status"
+									size="1">
+								<?php
+								$status = array(Text::_('COM_SPORTSMANAGER_NO'), Text::_('COM_SPORTSMANAGER_YES'));
+								for ($i = 1; $i >= 0; $i--) {
+									echo "<option value=\"" . $i . "\"" . ($row != null ? ($row->status == $i ? " selected" : "") : "") . ">" . htmlentities_utf8($status[$i]) . "</option>";
+								}
+								?>
+							</select>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap colspan="2">&nbsp;
+						</td>
+					</tr>
                 </table>
             </div>
 
@@ -8855,434 +8883,438 @@ class HTML_sportsmanager_admin
               enctype="multipart/form-data">
             <div class="uk-overflow-auto">
                 <table style="width: 100%;padding-top: 20px;">
-                    <tr>
-                        <td nowrap style="width: 60%; vertical-align: top;">
-                            <div class="uk-overflow-auto">
-                                <table style="width: 100%;">
-                                    <tr>
-                                        <td nowrap style="width: 20%; text-align: right;">
-                                            <label for="team_name"><?php echo Text::_('COM_SPORTSMANAGER_TEAM_NAME'); ?>
-                                                :</label>
-                                        </td>
-                                        <td nowrap>
-                                            <input class="uk-select uk-form-width-medium" type="text" name="teamname" id="team_name"
-												   size="50" maxlength="50" style="height: 34px; width: 370px;"
-                                                   value="<?php if ($row != null) echo htmlentities_utf8($row->teamname); ?>"/>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td nowrap style="width: 20%; text-align: right;">
-                                            <label for="team_name_kurz"><?php echo Text::_('COM_SPORTSMANAGER_TEAM_NAME_SHORT'); ?>
-                                                :</label>
-                                        </td>
-                                        <td nowrap>
-                                            <input class="uk-select uk-form-width-medium" type="text" name="teamname_kurz" id="team_name_kurz"
-												   size="50" maxlength="24" style="height: 34px; width: 370px;"
-                                                   value="<?php if ($row != null) echo htmlentities_utf8($row->teamname_kurz); ?>"/>
-                                        </td>
-                                    </tr>
-                                    <?php
-                                    if ($veranstaltung->tabellenwertung == -2) {
-                                        ?>
-                                        <tr>
-                                            <td nowrap style="width: 20%; text-align: right">
-                                                <label for="place"><?php echo Text::_('COM_SPORTSMANAGER_PLACE'); ?>
-                                                    :</label>
-                                            </td>
-                                            <td nowrap>
-                                                <input class="uk-select uk-form-width-medium" type="text" name="platz" id="place" size="5"
-                                                       maxlength="6"
-                                                       value="<?php if ($row != null) echo htmlentities_utf8($row->platz); ?>"/>
-                                            </td>
-                                        </tr>
-                                        <?php
-                                    }
-                                    ?>
-                                    <tr>
-                                        <td nowrap style="width: 20%; text-align: right">
-                                            <label for="club"><?php echo Text::_('COM_SPORTSMANAGER_CLUB'); ?>:</label>
-                                        </td>
-                                        <td nowrap>
-                                            <select class="uk-select uk-form-width-medium" name="verein_id" id="club"
-                                                    style="width: 370px;" size="1">
-                                                <option
-                                                    value="0"><?php echo Text::_('COM_SPORTSMANAGER_NONE'); ?></option>
-                                                <?php
-                                                $veranstalterbezeichnung = -1;
-                                                foreach ($vereine as $verein) {
-                                                    if ($veranstalterbezeichnung != $verein->veranstalterbezeichnung) {
-                                                        if ($veranstalterbezeichnung != -1)
-                                                            echo "</optgroup>";
-                                                        echo "<optgroup label=\"" . htmlentities_utf8($verein->veranstalterbezeichnung != null ? $verein->veranstalterbezeichnung : Text::_('COM_SPORTSMANAGER_WITHOUT_ORGANIZATION')) . "\">";
-                                                        $veranstalterbezeichnung = $verein->veranstalterbezeichnung;
-                                                    }
-                                                    echo "<option value=\"" . $verein->verein_id . "\"" . ($row != null ? ($verein->verein_id == $row->verein_id ? " selected" : "") : "") . ">" . htmlentities_utf8($verein->vereinsname . ($verein->ausgetreten ? " (" . Text::_('COM_SPORTSMANAGER_BEATEN') . ")" : "")) . "</option>";
-                                                }
-                                                if ($veranstalterbezeichnung != -1)
-                                                    echo "</optgroup>";
-                                                ?>
-                                            </select>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td nowrap style="width: 20%; text-align: right">
-                                            <label
-                                                for="table_type"><?php echo Text::_('COM_SPORTSMANAGER_TABLE_TYPE'); ?>
-                                                :</label>
-                                        </td>
-                                        <td nowrap>
-                                            <input class="uk-select uk-form-width-medium" type="text" name="tischtyp" id="table_type"
-                                                   size="50" maxlength="200" style="height: 34px; width: 370px;"
-                                                   value="<?php if ($row != null) echo htmlentities_utf8($row->tischtyp); ?>"/>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td nowrap style="width: 20%; text-align: right">
-                                            <label
-                                                for="table_characteristics"><?php echo Text::_('COM_SPORTSMANAGER_TABLE_CHARACTERISTICS'); ?>
-                                                :</label>
-                                        </td>
-                                        <td nowrap>
-                                            <input class="uk-select uk-form-width-medium" type="text" name="tischeigenschaften" id="table_characteristics"
-												   size="24" maxlength="50" style="height: 34px; width: 370px;"
-                                                   value="<?php if ($row != null) echo htmlentities_utf8($row->tischeigenschaften); ?>"/>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td nowrap style="width: 20%; text-align: right">
-                                            <?php echo Text::_('COM_SPORTSMANAGER_HOME_MATCH_TIME'); ?>:
-                                        </td>
-                                        <td nowrap>
-                                            <select class="uk-select uk-form-width-small" name="heimspiel_wochentag"
-                                                    style="width: 160px;" size="1"
-                                                    aria-label="<?php echo Text::_('COM_SPORTSMANAGER_HOME_MATCH_TIME'); ?>">
-                                                <?php
-                                                $wochentag = $row != null ? $row->heimspiel_wochentag : 0;
-                                                $wochentage = array(Text::_('COM_SPORTSMANAGER_WEEK_MONDAY'), Text::_('COM_SPORTSMANAGER_WEEK_TUESDAY'), Text::_('COM_SPORTSMANAGER_WEEK_WEDNESDAY'), Text::_('COM_SPORTSMANAGER_WEEK_THURSDAY'), Text::_('COM_SPORTSMANAGER_WEEK_FRIDAY'), Text::_('COM_SPORTSMANAGER_WEEK_SATURDAY'), Text::_('COM_SPORTSMANAGER_WEEK_SUNDAY'));
-                                                echo "<option value=\"0\" " . ($wochentag == 0 ? "selected" : "") . "></option>";
-                                                for ($i = 1; $i <= 7; $i++) {
-                                                    echo "<option value=\"" . $i . "\" " . ($wochentag == $i ? "selected" : "") . ">" . htmlentities_utf8($wochentage[$i - 1]) . "</option>";
-                                                }
-                                                ?>
-                                            </select>
-                                            <select class="uk-select uk-form-width-small"
-                                                    name="heimspiel_uhrzeit_stunden"
-                                                    style="width: 100px;" size="1"
-                                                    aria-label="<?php echo Text::_('COM_SPORTSMANAGER_HOME_MATCH_TIME'); ?>">
-                                                <?php
-                                                $stunden = $row != null ? floor($row->heimspiel_uhrzeit / 100) : -1;
-                                                echo "<option value=\"0\" " . ($stunden == -1 ? "selected" : "") . "></option>";
-                                                for ($i = 0; $i <= 23; $i++) {
-                                                    echo "<option value=\"" . $i . "\" " . ($wochentag > 0 && $stunden == $i ? "selected" : "") . ">" . sprintf("%02d", $i) . "</option>";
-                                                }
-                                                ?>
-                                            </select>
-                                            <select class="uk-select uk-form-width-small"
-                                                    name="heimspiel_uhrzeit_minuten"
-                                                    style="width: 100px;" size="1"
-                                                    aria-label="<?php echo Text::_('COM_SPORTSMANAGER_HOME_MATCH_TIME'); ?>">
-                                                <?php
-                                                $minuten = $row != null ? $row->heimspiel_uhrzeit % 100 : -1;
-                                                echo "<option value=\"0\" " . ($minuten == -1 ? "selected" : "") . "></option>";
-                                                for ($i = 0; $i <= 59; $i += 5) {
-                                                    echo "<option value=\"" . $i . "\" " . ($wochentag > 0 && $minuten == $i ? "selected" : "") . ">" . sprintf("%02d", $i) . "</option>";
-                                                }
-                                                ?>
-                                            </select>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td nowrap style="width: 20%; text-align: right">
-                                            <label
-                                                for="home_venue"><?php echo Text::_('COM_SPORTSMANAGER_HOME_VENUE'); ?>
-                                                :</label>
-                                        </td>
-                                        <td nowrap>
-                                            <select class="uk-select uk-form-width-medium" name="heimspielort_id" style="width: 370px;"
-                                                    id="home_venue" size="1">
-                                                <option
-                                                    value="0"><?php echo Text::_('COM_SPORTSMANAGER_NONE'); ?></option>
-                                                <?php
-                                                $ortsname = -1;
-                                                foreach ($spielorte as $spielort) {
-                                                    if ($ortsname != $spielort->ortsname) {
-                                                        if ($ortsname != -1)
-                                                            echo "</optgroup>";
-                                                        echo "<optgroup label=\"" . htmlentities_utf8(!empty($spielort->ortsname) ? $spielort->ortsname : Text::_('COM_SPORTSMANAGER_WITHOUT_PLACE')) . "\">";
-                                                        $ortsname = $spielort->ortsname;
-                                                    }
-                                                    echo "<option value=\"" . $spielort->spielort_id . "\"" . ($row != null ? ($spielort->spielort_id == $row->heimspielort_id ? " selected" : "") : "") . ">" . htmlentities_utf8($spielort->name) . "</option>";
-                                                }
-                                                if ($ortsname != -1)
-                                                    echo "</optgroup>";
-                                                ?>
-                                            </select>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td nowrap style="width: 20%; text-align: right">
-                                            <label
-                                                for="non_smoker_protection"><?php echo Text::_('COM_SPORTSMANAGER_NON_SMOKING_PROTECTION'); ?>
-                                                :</label>
-                                        </td>
-                                        <td nowrap>
-                                            <select class="uk-select uk-form-width-medium" name="nichtraucherschutz" style="width: 370px;"
-                                                    id="non_smoker_protection" size="1">
-                                                <?php
-                                                $typ = array(
-                                                    0 => '',
-                                                    1 => Text::_('COM_SPORTSMANAGER_NON_SMOKING_PROTECTION_HOME_AND_AWAY'),
-                                                    2 => Text::_('COM_SPORTSMANAGER_NON_SMOKING_PROTECTION_HOME'),
-                                                    3 => Text::_('COM_SPORTSMANAGER_NON_SMOKING_PROTECTION_HOME_AND_NOT_AWAY'),
-                                                    4 => Text::_('COM_SPORTSMANAGER_NON_SMOKING_PROTECTION_AWAY'),
-                                                    5 => Text::_('COM_SPORTSMANAGER_NON_SMOKING_PROTECTION_AWAY_AND_NOT_HOME'),
-                                                    6 => Text::_('COM_SPORTSMANAGER_NON_SMOKING_PROTECTION_NOT_HOME'),
-                                                    7 => Text::_('COM_SPORTSMANAGER_NON_SMOKING_PROTECTION_NOT_AWAY'),
-                                                    8 => Text::_('COM_SPORTSMANAGER_NON_SMOKING_PROTECTION_NOR_HOME_OR_AWAY')
-                                                );
+					<tr>
+						<td nowrap style="width: 20%; text-align: right;">
+							<label for="team_name"><?php echo Text::_('COM_SPORTSMANAGER_TEAM_NAME'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+							<input class="uk-select uk-form-width-medium" type="text" name="teamname" id="team_name"
+								   size="50" maxlength="50" style="height: 34px; width: 370px;"
+								   value="<?php if ($row != null) echo htmlentities_utf8($row->teamname); ?>"/>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right;">
+							<label for="team_name_kurz"><?php echo Text::_('COM_SPORTSMANAGER_TEAM_NAME_SHORT'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+							<input class="uk-select uk-form-width-medium" type="text" name="teamname_kurz" id="team_name_kurz"
+								   size="50" maxlength="24" style="height: 34px; width: 370px;"
+								   value="<?php if ($row != null) echo htmlentities_utf8($row->teamname_kurz); ?>"/>
+						</td>
+					</tr>
+					<?php
+					if ($veranstaltung->tabellenwertung == -2) {
+						?>
+						<tr>
+							<td nowrap style="width: 20%; text-align: right">
+								<label for="place"><?php echo Text::_('COM_SPORTSMANAGER_PLACE'); ?>
+									:</label>
+							</td>
+							<td nowrap>
+								<input class="uk-select uk-form-width-medium" type="text" name="platz" id="place" size="5"
+									   maxlength="6"
+									   value="<?php if ($row != null) echo htmlentities_utf8($row->platz); ?>"/>
+							</td>
+						</tr>
+						<?php
+					}
+					?>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right">
+							<label for="club"><?php echo Text::_('COM_SPORTSMANAGER_CLUB'); ?>:</label>
+						</td>
+						<td nowrap>
+							<select class="uk-select uk-form-width-medium" name="verein_id" id="club"
+									style="width: 370px;" size="1">
+								<option
+									value="0"><?php echo Text::_('COM_SPORTSMANAGER_NONE'); ?></option>
+								<?php
+								$veranstalterbezeichnung = -1;
+								foreach ($vereine as $verein) {
+									if ($veranstalterbezeichnung != $verein->veranstalterbezeichnung) {
+										if ($veranstalterbezeichnung != -1)
+											echo "</optgroup>";
+										echo "<optgroup label=\"" . htmlentities_utf8($verein->veranstalterbezeichnung != null ? $verein->veranstalterbezeichnung : Text::_('COM_SPORTSMANAGER_WITHOUT_ORGANIZATION')) . "\">";
+										$veranstalterbezeichnung = $verein->veranstalterbezeichnung;
+									}
+									echo "<option value=\"" . $verein->verein_id . "\"" . ($row != null ? ($verein->verein_id == $row->verein_id ? " selected" : "") : "") . ">" . htmlentities_utf8($verein->vereinsname . ($verein->ausgetreten ? " (" . Text::_('COM_SPORTSMANAGER_BEATEN') . ")" : "")) . "</option>";
+								}
+								if ($veranstalterbezeichnung != -1)
+									echo "</optgroup>";
+								?>
+							</select>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right">
+							<label
+								for="table_type"><?php echo Text::_('COM_SPORTSMANAGER_TABLE_TYPE'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+							<input class="uk-select uk-form-width-medium" type="text" name="tischtyp" id="table_type"
+								   size="50" maxlength="200" style="height: 34px; width: 370px;"
+								   value="<?php if ($row != null) echo htmlentities_utf8($row->tischtyp); ?>"/>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right">
+							<label
+								for="table_characteristics"><?php echo Text::_('COM_SPORTSMANAGER_TABLE_CHARACTERISTICS'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+							<input class="uk-select uk-form-width-medium" type="text" name="tischeigenschaften" id="table_characteristics"
+								   size="24" maxlength="50" style="height: 34px; width: 370px;"
+								   value="<?php if ($row != null) echo htmlentities_utf8($row->tischeigenschaften); ?>"/>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right">
+							<?php echo Text::_('COM_SPORTSMANAGER_HOME_MATCH_TIME'); ?>:
+						</td>
+						<td nowrap>
+							<select class="uk-select uk-form-width-small" name="heimspiel_wochentag"
+									style="width: 160px;" size="1"
+									aria-label="<?php echo Text::_('COM_SPORTSMANAGER_HOME_MATCH_TIME'); ?>">
+								<?php
+								$wochentag = $row != null ? $row->heimspiel_wochentag : 0;
+								$wochentage = array(Text::_('COM_SPORTSMANAGER_WEEK_MONDAY'), Text::_('COM_SPORTSMANAGER_WEEK_TUESDAY'), Text::_('COM_SPORTSMANAGER_WEEK_WEDNESDAY'), Text::_('COM_SPORTSMANAGER_WEEK_THURSDAY'), Text::_('COM_SPORTSMANAGER_WEEK_FRIDAY'), Text::_('COM_SPORTSMANAGER_WEEK_SATURDAY'), Text::_('COM_SPORTSMANAGER_WEEK_SUNDAY'));
+								echo "<option value=\"0\" " . ($wochentag == 0 ? "selected" : "") . "></option>";
+								for ($i = 1; $i <= 7; $i++) {
+									echo "<option value=\"" . $i . "\" " . ($wochentag == $i ? "selected" : "") . ">" . htmlentities_utf8($wochentage[$i - 1]) . "</option>";
+								}
+								?>
+							</select>
+							<select class="uk-select uk-form-width-small"
+									name="heimspiel_uhrzeit_stunden"
+									style="width: 100px;" size="1"
+									aria-label="<?php echo Text::_('COM_SPORTSMANAGER_HOME_MATCH_TIME'); ?>">
+								<?php
+								$stunden = $row != null ? floor($row->heimspiel_uhrzeit / 100) : -1;
+								echo "<option value=\"0\" " . ($stunden == -1 ? "selected" : "") . "></option>";
+								for ($i = 0; $i <= 23; $i++) {
+									echo "<option value=\"" . $i . "\" " . ($wochentag > 0 && $stunden == $i ? "selected" : "") . ">" . sprintf("%02d", $i) . "</option>";
+								}
+								?>
+							</select>
+							<select class="uk-select uk-form-width-small"
+									name="heimspiel_uhrzeit_minuten"
+									style="width: 100px;" size="1"
+									aria-label="<?php echo Text::_('COM_SPORTSMANAGER_HOME_MATCH_TIME'); ?>">
+								<?php
+								$minuten = $row != null ? $row->heimspiel_uhrzeit % 100 : -1;
+								echo "<option value=\"0\" " . ($minuten == -1 ? "selected" : "") . "></option>";
+								for ($i = 0; $i <= 59; $i += 5) {
+									echo "<option value=\"" . $i . "\" " . ($wochentag > 0 && $minuten == $i ? "selected" : "") . ">" . sprintf("%02d", $i) . "</option>";
+								}
+								?>
+							</select>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right">
+							<label
+								for="home_venue"><?php echo Text::_('COM_SPORTSMANAGER_HOME_VENUE'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+							<select class="uk-select uk-form-width-medium" name="heimspielort_id" style="width: 370px;"
+									id="home_venue" size="1">
+								<option
+									value="0"><?php echo Text::_('COM_SPORTSMANAGER_NONE'); ?></option>
+								<?php
+								$ortsname = -1;
+								foreach ($spielorte as $spielort) {
+									if ($ortsname != $spielort->ortsname) {
+										if ($ortsname != -1)
+											echo "</optgroup>";
+										echo "<optgroup label=\"" . htmlentities_utf8(!empty($spielort->ortsname) ? $spielort->ortsname : Text::_('COM_SPORTSMANAGER_WITHOUT_PLACE')) . "\">";
+										$ortsname = $spielort->ortsname;
+									}
+									echo "<option value=\"" . $spielort->spielort_id . "\"" . ($row != null ? ($spielort->spielort_id == $row->heimspielort_id ? " selected" : "") : "") . ">" . htmlentities_utf8($spielort->name) . "</option>";
+								}
+								if ($ortsname != -1)
+									echo "</optgroup>";
+								?>
+							</select>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right">
+							<label
+								for="trainingdays"><?php echo Text::_('COM_SPORTSMANAGER_TRAINING_DAYS'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+							<input class="uk-select uk-form-width-medium" type="text" name="trainingstage" id="trainingdays"
+								   size="50" maxlength="64" style="height: 34px; width: 370px;"
+								   value="<?php if ($row != null) echo htmlentities_utf8($row->trainingstage); ?>"/>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right">
+							<label
+								for="non_smoker_protection"><?php echo Text::_('COM_SPORTSMANAGER_NON_SMOKING_PROTECTION'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+							<select class="uk-select uk-form-width-medium" name="nichtraucherschutz" style="width: 370px;"
+									id="non_smoker_protection" size="1">
+								<?php
+								$typ = array(
+									0 => '',
+									1 => Text::_('COM_SPORTSMANAGER_NON_SMOKING_PROTECTION_HOME_AND_AWAY'),
+									2 => Text::_('COM_SPORTSMANAGER_NON_SMOKING_PROTECTION_HOME'),
+									3 => Text::_('COM_SPORTSMANAGER_NON_SMOKING_PROTECTION_HOME_AND_NOT_AWAY'),
+									4 => Text::_('COM_SPORTSMANAGER_NON_SMOKING_PROTECTION_AWAY'),
+									5 => Text::_('COM_SPORTSMANAGER_NON_SMOKING_PROTECTION_AWAY_AND_NOT_HOME'),
+									6 => Text::_('COM_SPORTSMANAGER_NON_SMOKING_PROTECTION_NOT_HOME'),
+									7 => Text::_('COM_SPORTSMANAGER_NON_SMOKING_PROTECTION_NOT_AWAY'),
+									8 => Text::_('COM_SPORTSMANAGER_NON_SMOKING_PROTECTION_NOR_HOME_OR_AWAY')
+								);
 
-                                                foreach ($typ as $typ_wert => $typ_bezeichnung)
-                                                    echo "<option value=\"" . $typ_wert . "\"" . ($row != null ? ($row->nichtraucherschutz == $typ_wert ? " selected" : "") : "") . ">" . htmlentities_utf8($typ_bezeichnung) . "</option>";
-                                                ?>
-                                            </select>
-                                        </td>
-                                    </tr>
-                                    <?php
-                                    if ($veranstaltung->tabellenwertung <= 9) {
-                                        ?>
-                                        <tr>
-                                            <td nowrap style="width: 20%; text-align: right">
-                                                <label
-                                                    for="penality_points"><?php echo Text::_('COM_SPORTSMANAGER_PENALTY_POINTS'); ?>
-                                                    :</label>
-                                            </td>
-                                            <td nowrap>
-                                                <select class="uk-select uk-form-width-medium" name="zusatzpunkte" style="width: 370px;"
-                                                        id="penality_points" size="1">
-                                                    <?php
-                                                    echo "<option value=\"0\">0</option>";
-                                                    for ($i = -0.5; $i >= -20; $i -= 0.5) {
-                                                        echo "<option value=\"" . $i . "\" " . ($row != null && $i == $row->zusatzpunkte ? "selected" : "") . ">" . $i . "</option>";
-                                                    }
-                                                    ?>
-                                                </select>
-                                            </td>
-                                        </tr>
-                                        <?php
-                                    }
-                                    $veranstaltungen_bezeichnungen = array();
-                                    $veranstaltungen_beruecksichtigt = array();
-                                    $veranstaltungen_beruecksichtigt_begegnungen = array();
-                                    $veranstaltungen_beruecksichtigt_moderator = array();
-                                    foreach ($veranstaltungen as $v) {
-                                        $veranstaltungen_bezeichnungen[$v->veranstaltung_id] = $v->bezeichnung . " (" . FormatiertesDatum($v->erster_tag, false, false) . " - " . FormatiertesDatum($v->letzter_tag, false, false) . ")";
-                                        if ($row != null && $row->teamgruppe_id != null && $v->team_id != null) {
-                                            $veranstaltungen_beruecksichtigt[] = $v->veranstaltung_id;
-                                            $veranstaltungen_beruecksichtigt_begegnungen[] = $v->team_begegnungen;
-                                            $veranstaltungen_beruecksichtigt_moderator[] = $beschraenkter_zugriff_veranstaltungen ? $v->veranstaltung_moderator : 1;
-                                        }
-                                    }
-                                    $n = count($veranstaltungen_beruecksichtigt);
-                                    ?>
-                                    <input type="hidden" name="weitere_veranstaltungen_anzahl"
-                                           value="<?php echo max(3, $n + 1); ?>"/>
-                                    <?php
-                                    for ($i = 0; $i < max(3, $n + 1); $i++) {
-                                        ?>
-                                        <tr>
-                                            <td nowrap style="width: 20%; text-align: right">
-                                                <label
-                                                    for="further_competition"><?php echo Text::_('COM_SPORTSMANAGER_FURTHER_COMPETITION'); ?>
-                                                    :</label>
-                                            </td>
-                                            <td nowrap>
-                                                <?php
-                                                if (!empty($row) && $i < $n && ($veranstaltungen_beruecksichtigt_begegnungen[$i] > 0 || ($beschraenkter_zugriff_veranstaltungen && !$veranstaltungen_beruecksichtigt_moderator[$i]))) {
-                                                    echo htmlentities_utf8($veranstaltungen_bezeichnungen[$veranstaltungen_beruecksichtigt[$i]]);
-                                                    echo "<input type=\"hidden\" name=\"weitere_veranstaltung_id_" . $i . "\" value=\"" . $veranstaltungen_beruecksichtigt[$i] . "\">";
-                                                } else {
-                                                    ?>
-                                                    <select class="uk-select uk-form-width-medium" style="width: 370px;"
-                                                            name="weitere_veranstaltung_id_<?php echo $i; ?>"
-                                                            id="further_competition" size="1">
-                                                        <option value="0"></option>
-                                                        <?php
-                                                        foreach ($veranstaltungen as $v) {
-                                                            echo "<option value=\"" . $v->veranstaltung_id . "\"" . ($row != null && $i < $n ? ($v->veranstaltung_id == $veranstaltungen_beruecksichtigt[$i] ? " selected" : "") : "") . ">" . htmlentities_utf8($veranstaltungen_bezeichnungen[$v->veranstaltung_id]) . "</option>";
-                                                        }
-                                                        ?>
-                                                    </select>
-                                                    <?php
-                                                }
-                                                ?>
-                                            </td>
-                                        </tr>
-                                        <?php
-                                    }
-                                    ?>
+								foreach ($typ as $typ_wert => $typ_bezeichnung)
+									echo "<option value=\"" . $typ_wert . "\"" . ($row != null ? ($row->nichtraucherschutz == $typ_wert ? " selected" : "") : "") . ">" . htmlentities_utf8($typ_bezeichnung) . "</option>";
+								?>
+							</select>
+						</td>
+					</tr>
+					<?php
+					if ($veranstaltung->tabellenwertung <= 9) {
+						?>
+						<tr>
+							<td nowrap style="width: 20%; text-align: right">
+								<label
+									for="penality_points"><?php echo Text::_('COM_SPORTSMANAGER_PENALTY_POINTS'); ?>
+									:</label>
+							</td>
+							<td nowrap>
+								<select class="uk-select uk-form-width-medium" name="zusatzpunkte" style="width: 370px;"
+										id="penality_points" size="1">
+									<?php
+									echo "<option value=\"0\">0</option>";
+									for ($i = -0.5; $i >= -20; $i -= 0.5) {
+										echo "<option value=\"" . $i . "\" " . ($row != null && $i == $row->zusatzpunkte ? "selected" : "") . ">" . $i . "</option>";
+									}
+									?>
+								</select>
+							</td>
+						</tr>
+						<?php
+					}
+					$veranstaltungen_bezeichnungen = array();
+					$veranstaltungen_beruecksichtigt = array();
+					$veranstaltungen_beruecksichtigt_begegnungen = array();
+					$veranstaltungen_beruecksichtigt_moderator = array();
+					foreach ($veranstaltungen as $v) {
+						$veranstaltungen_bezeichnungen[$v->veranstaltung_id] = $v->bezeichnung . " (" . FormatiertesDatum($v->erster_tag, false, false) . " - " . FormatiertesDatum($v->letzter_tag, false, false) . ")";
+						if ($row != null && $row->teamgruppe_id != null && $v->team_id != null) {
+							$veranstaltungen_beruecksichtigt[] = $v->veranstaltung_id;
+							$veranstaltungen_beruecksichtigt_begegnungen[] = $v->team_begegnungen;
+							$veranstaltungen_beruecksichtigt_moderator[] = $beschraenkter_zugriff_veranstaltungen ? $v->veranstaltung_moderator : 1;
+						}
+					}
+					$n = count($veranstaltungen_beruecksichtigt);
+					?>
+					<input type="hidden" name="weitere_veranstaltungen_anzahl"
+						   value="<?php echo max(3, $n + 1); ?>"/>
+					<?php
+					for ($i = 0; $i < max(3, $n + 1); $i++) {
+						?>
+						<tr>
+							<td nowrap style="width: 20%; text-align: right">
+								<label
+									for="further_competition"><?php echo Text::_('COM_SPORTSMANAGER_FURTHER_COMPETITION'); ?>
+									:</label>
+							</td>
+							<td nowrap>
+								<?php
+								if (!empty($row) && $i < $n && ($veranstaltungen_beruecksichtigt_begegnungen[$i] > 0 || ($beschraenkter_zugriff_veranstaltungen && !$veranstaltungen_beruecksichtigt_moderator[$i]))) {
+									echo htmlentities_utf8($veranstaltungen_bezeichnungen[$veranstaltungen_beruecksichtigt[$i]]);
+									echo "<input type=\"hidden\" name=\"weitere_veranstaltung_id_" . $i . "\" value=\"" . $veranstaltungen_beruecksichtigt[$i] . "\">";
+								} else {
+									?>
+									<select class="uk-select uk-form-width-medium" style="width: 370px;"
+											name="weitere_veranstaltung_id_<?php echo $i; ?>"
+											id="further_competition" size="1">
+										<option value="0"></option>
+										<?php
+										foreach ($veranstaltungen as $v) {
+											echo "<option value=\"" . $v->veranstaltung_id . "\"" . ($row != null && $i < $n ? ($v->veranstaltung_id == $veranstaltungen_beruecksichtigt[$i] ? " selected" : "") : "") . ">" . htmlentities_utf8($veranstaltungen_bezeichnungen[$v->veranstaltung_id]) . "</option>";
+										}
+										?>
+									</select>
+									<?php
+								}
+								?>
+							</td>
+						</tr>
+						<?php
+					}
+					?>
 
-                                    <?php
-                                    $kontakte = $teamansprechpartner != null ? count($teamansprechpartner) : 0;
-                                    for ($nummer = 1; $nummer <= 2; $nummer++) {
-                                        ?>
-                                        <tr>
-                                            <td nowrap style="width: 20%; text-align: right">
-                                                <b><?php echo Text::_('COM_SPORTSMANAGER_CONTACT'); ?> <?php echo $nummer; ?>
-                                                    :</b>
-                                            </td>
-                                            <td>
-                                                <input type="hidden"
-                                                       name="teamansprechpartner_<?php echo $nummer; ?>_id"
-                                                       value="<?php if ($kontakte >= $nummer) echo $teamansprechpartner[$nummer - 1]->kontaktperson_id; else echo "0"; ?>"/>
-                                            </td>
-                                        <tr>
-                                            <td nowrap style="width: 20%; text-align: right">
-                                                <label
-                                                    for="firstname"><?php echo Text::_('COM_SPORTSMANAGER_FIRST_NAME'); ?>
-                                                    :</label>
-                                            </td>
-                                            <td nowrap>
-                                                <input class="inputbox" type="text"
-                                                       name="teamansprechpartner_<?php echo $nummer; ?>_vorname"
-                                                       id="firstname" size="50"
-                                                       maxlength="30"
-                                                       value="<?php if ($kontakte >= $nummer) echo htmlentities_utf8($teamansprechpartner[$nummer - 1]->vorname); ?>"/>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td nowrap style="width: 20%; text-align: right">
-                                                <label
-                                                    for="lastname"><?php echo Text::_('COM_SPORTSMANAGER_LAST_NAME'); ?>
-                                                    :</label>
-                                            </td>
-                                            <td nowrap>
-                                                <input class="inputbox" type="text"
-                                                       name="teamansprechpartner_<?php echo $nummer; ?>_nachname"
-                                                       id="lastname" size="50"
-                                                       maxlength="30"
-                                                       value="<?php if ($kontakte >= $nummer) echo htmlentities_utf8($teamansprechpartner[$nummer - 1]->nachname); ?>"/>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td nowrap style="width: 20%; text-align: right">
-                                                <label for="telephone"><?php echo Text::_('COM_SPORTSMANAGER_PHONE'); ?>
-                                                    :</label>
-                                            </td>
-                                            <td nowrap>
-                                                <input class="inputbox" type="text"
-                                                       name="teamansprechpartner_<?php echo $nummer; ?>_telefon"
-                                                       id="telephone" size="50"
-                                                       maxlength="25"
-                                                       value="<?php if ($kontakte >= $nummer) echo htmlentities_utf8($teamansprechpartner[$nummer - 1]->telefon); ?>"/>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td nowrap style="width: 20%; text-align: right">
-                                                <label for="mobile"><?php echo Text::_('COM_SPORTSMANAGER_MOBILE'); ?>
-                                                    :</label>
-                                            </td>
-                                            <td nowrap>
-                                                <input class="inputbox" type="text"
-                                                       name="teamansprechpartner_<?php echo $nummer; ?>_mobil"
-                                                       id="mobile" size="50"
-                                                       maxlength="25"
-                                                       value="<?php if ($kontakte >= $nummer) echo htmlentities_utf8($teamansprechpartner[$nummer - 1]->mobil); ?>"/>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td nowrap style="width: 20%; text-align: right">
-                                                <label for="email"><?php echo Text::_('COM_SPORTSMANAGER_EMAIL'); ?>
-                                                    :</label>
-                                            </td>
-                                            <td nowrap>
-                                                <input class="inputbox" type="text"
-                                                       name="teamansprechpartner_<?php echo $nummer; ?>_email"
-                                                       id="email" size="50"
-                                                       maxlength="64"
-                                                       value="<?php if ($kontakte >= $nummer) echo htmlentities_utf8($teamansprechpartner[$nummer - 1]->email); ?>"/>
-                                            </td>
-                                        </tr>
+					<?php
+					$kontakte = $teamansprechpartner != null ? count($teamansprechpartner) : 0;
+					for ($nummer = 1; $nummer <= 2; $nummer++) {
+						?>
+						<tr>
+							<td nowrap style="width: 20%; text-align: right">
+								<b><?php echo Text::_('COM_SPORTSMANAGER_CONTACT'); ?> <?php echo $nummer; ?>
+									:</b>
+							</td>
+							<td>
+								<input type="hidden"
+									   name="teamansprechpartner_<?php echo $nummer; ?>_id"
+									   value="<?php if ($kontakte >= $nummer) echo $teamansprechpartner[$nummer - 1]->kontaktperson_id; else echo "0"; ?>"/>
+							</td>
+						<tr>
+							<td nowrap style="width: 20%; text-align: right">
+								<label
+									for="firstname"><?php echo Text::_('COM_SPORTSMANAGER_FIRST_NAME'); ?>
+									:</label>
+							</td>
+							<td nowrap>
+								<input class="inputbox" type="text"
+									   name="teamansprechpartner_<?php echo $nummer; ?>_vorname"
+									   id="firstname" size="50"
+									   maxlength="30"
+									   value="<?php if ($kontakte >= $nummer) echo htmlentities_utf8($teamansprechpartner[$nummer - 1]->vorname); ?>"/>
+							</td>
+						</tr>
+						<tr>
+							<td nowrap style="width: 20%; text-align: right">
+								<label
+									for="lastname"><?php echo Text::_('COM_SPORTSMANAGER_LAST_NAME'); ?>
+									:</label>
+							</td>
+							<td nowrap>
+								<input class="inputbox" type="text"
+									   name="teamansprechpartner_<?php echo $nummer; ?>_nachname"
+									   id="lastname" size="50"
+									   maxlength="30"
+									   value="<?php if ($kontakte >= $nummer) echo htmlentities_utf8($teamansprechpartner[$nummer - 1]->nachname); ?>"/>
+							</td>
+						</tr>
+						<tr>
+							<td nowrap style="width: 20%; text-align: right">
+								<label for="telephone"><?php echo Text::_('COM_SPORTSMANAGER_PHONE'); ?>
+									:</label>
+							</td>
+							<td nowrap>
+								<input class="inputbox" type="text"
+									   name="teamansprechpartner_<?php echo $nummer; ?>_telefon"
+									   id="telephone" size="50"
+									   maxlength="25"
+									   value="<?php if ($kontakte >= $nummer) echo htmlentities_utf8($teamansprechpartner[$nummer - 1]->telefon); ?>"/>
+							</td>
+						</tr>
+						<tr>
+							<td nowrap style="width: 20%; text-align: right">
+								<label for="mobile"><?php echo Text::_('COM_SPORTSMANAGER_MOBILE'); ?>
+									:</label>
+							</td>
+							<td nowrap>
+								<input class="inputbox" type="text"
+									   name="teamansprechpartner_<?php echo $nummer; ?>_mobil"
+									   id="mobile" size="50"
+									   maxlength="25"
+									   value="<?php if ($kontakte >= $nummer) echo htmlentities_utf8($teamansprechpartner[$nummer - 1]->mobil); ?>"/>
+							</td>
+						</tr>
+						<tr>
+							<td nowrap style="width: 20%; text-align: right">
+								<label for="email"><?php echo Text::_('COM_SPORTSMANAGER_EMAIL'); ?>
+									:</label>
+							</td>
+							<td nowrap>
+								<input class="inputbox" type="text"
+									   name="teamansprechpartner_<?php echo $nummer; ?>_email"
+									   id="email" size="50"
+									   maxlength="64"
+									   value="<?php if ($kontakte >= $nummer) echo htmlentities_utf8($teamansprechpartner[$nummer - 1]->email); ?>"/>
+							</td>
+						</tr>
 
-                                        <?php
-                                    }
-                                    ?>
+						<?php
+					}
+					?>
 
-                                    <tr>
-                                        <td nowrap style="width: 20%; text-align: right; vertical-align: top">
-                                            <?php echo Text::_('COM_SPORTSMANAGER_ELIGIBLE_FOR_TEAM'); ?>
-                                        </td>
-                                        <td nowrap>
-                                            <table style="border-spacing: 0; padding: 0">
-												<?php
-												$berechtigte = $berechtigt_fuer_team != null ? count($berechtigt_fuer_team) : 0;
-												for ($nummer = 1; $nummer <= 6; $nummer++) {
-													?>
-													<tr><td nowrap>
-														<select class="uk-select uk-form-width-medium" style="width: 370px;"
-																name="berechtigt_fuer_team_user_<?php echo $nummer; ?>_id"
-																size="1"
-																aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_ELIGIBLE_FOR_TEAM'); ?>">
-															<option value="0"></option>
-															<?php
-															foreach ($users as $user)
-																echo "<option value=\"" . $user->id . "\"" . ($nummer <= $berechtigte && $berechtigt_fuer_team[$nummer - 1]->berechtigt_user_id == $user->id ? "selected" : "") . ">" . htmlentities_utf8($user->name) . ($user->username != $user->name ? (" (" . htmlentities_utf8($user->username) . ")") : "") . "</option>";
-															?>
-														</select>
-													</td></tr>
-													<?php
-												}
-												?>
-                                            </table>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td nowrap style="width: 20%; text-align: right">
-                                            <label
-                                                for="pin"><?php echo Text::_('COM_SPORTSMANAGER_PIN_AUTHORIZATION'); ?>
-                                                :</label>
-                                        </td>
-                                        <td nowrap>
-                                            <input class="inputbox" type="text" name="pin" id="pin" size="50"
-                                                   maxlength="40"
-                                                   value="<?php if ($row != null) echo htmlentities_utf8($row->pin); ?>"/>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td nowrap style="width: 20%; text-align: right; vertical-align: top">
-                                            <?php echo Text::_('COM_SPORTSMANAGER_IMAGE'); ?>:
-                                        </td>
-                                        <td nowrap>
-                                            <?php
-                                            if ($row != null && ($bild = bildHTML("mannschaften", $row->team_id, 0, 0, 240, 240, 'border="0"')) != null) {
-                                                ?>
-                                                <label><input type="radio" name="bildbeibehalten" value="1"
-                                                              checked><?php echo Text::_('COM_SPORTSMANAGER_NEWS_IMAGE'); ?>
-                                                </label>
-                                                <br/><br/><?php echo $bild; ?>
-                                                <br/><br/><label><input type="radio" name="bildbeibehalten"
-                                                                        value="0"><?php echo Text::_('COM_SPORTSMANAGER_NEW_IMAGE_240_240'); ?>
-                                                </label>
-                                                <br/><br/><input type="file" name="bild" size="30"
-                                                                 onchange="document.adminForm.bildbeibehalten[1].checked = true;"/>
-                                                <?php
-                                            } else {
-                                                ?>
-                                                <?php echo Text::_('COM_SPORTSMANAGER_NEW_IMAGE_180_240'); ?>
-                                                <br/><br/><input type="file" name="bild" size="30"/>
-                                                <?php
-                                            }
-                                            ?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td nowrap colspan="2">&nbsp;
+					<tr>
+						<td nowrap style="width: 20%; text-align: right; vertical-align: top">
+							<?php echo Text::_('COM_SPORTSMANAGER_ELIGIBLE_FOR_TEAM'); ?>
+						</td>
+						<td nowrap>
+							<table style="border-spacing: 0; padding: 0">
+								<?php
+								$berechtigte = $berechtigt_fuer_team != null ? count($berechtigt_fuer_team) : 0;
+								for ($nummer = 1; $nummer <= 6; $nummer++) {
+									?>
+									<tr><td nowrap>
+										<select class="uk-select uk-form-width-medium" style="width: 370px;"
+												name="berechtigt_fuer_team_user_<?php echo $nummer; ?>_id"
+												size="1"
+												aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_ELIGIBLE_FOR_TEAM'); ?>">
+											<option value="0"></option>
+											<?php
+											foreach ($users as $user)
+												echo "<option value=\"" . $user->id . "\"" . ($nummer <= $berechtigte && $berechtigt_fuer_team[$nummer - 1]->berechtigt_user_id == $user->id ? "selected" : "") . ">" . htmlentities_utf8($user->name) . ($user->username != $user->name ? (" (" . htmlentities_utf8($user->username) . ")") : "") . "</option>";
+											?>
+										</select>
+									</td></tr>
+									<?php
+								}
+								?>
+							</table>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right">
+							<label
+								for="pin"><?php echo Text::_('COM_SPORTSMANAGER_PIN_AUTHORIZATION'); ?>
+								:</label>
+						</td>
+						<td nowrap>
+							<input class="inputbox" type="text" name="pin" id="pin" size="50"
+								   maxlength="40"
+								   value="<?php if ($row != null) echo htmlentities_utf8($row->pin); ?>"/>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap style="width: 20%; text-align: right; vertical-align: top">
+							<?php echo Text::_('COM_SPORTSMANAGER_IMAGE'); ?>:
+						</td>
+						<td nowrap>
+							<?php
+							if ($row != null && ($bild = bildHTML("mannschaften", $row->team_id, 0, 0, 240, 240, 'border="0"')) != null) {
+								?>
+								<label><input type="radio" name="bildbeibehalten" value="1"
+											  checked><?php echo Text::_('COM_SPORTSMANAGER_NEWS_IMAGE'); ?>
+								</label>
+								<br/><br/><?php echo $bild; ?>
+								<br/><br/><label><input type="radio" name="bildbeibehalten"
+														value="0"><?php echo Text::_('COM_SPORTSMANAGER_NEW_IMAGE_240_240'); ?>
+								</label>
+								<br/><br/><input type="file" name="bild" size="30"
+												 onchange="document.adminForm.bildbeibehalten[1].checked = true;"/>
+								<?php
+							} else {
+								?>
+								<?php echo Text::_('COM_SPORTSMANAGER_NEW_IMAGE_180_240'); ?>
+								<br/><br/><input type="file" name="bild" size="30"/>
+								<?php
+							}
+							?>
+						</td>
+					</tr>
+					<tr>
+						<td nowrap colspan="2">&nbsp;
 
-                                        </td>
-                                    </tr>
-                                </table>
-                            </div>
-                        </td>
-                    </tr>
+						</td>
+					</tr>
                 </table>
             </div>
 
diff --git a/src/structure/language/de-DE/de-DE.com_sportsmanager.ini b/src/structure/language/de-DE/de-DE.com_sportsmanager.ini
index 1a9e87a..28445aa 100644
--- a/src/structure/language/de-DE/de-DE.com_sportsmanager.ini
+++ b/src/structure/language/de-DE/de-DE.com_sportsmanager.ini
@@ -1067,4 +1067,6 @@ COM_SPORTSMANAGER_MATCH_RESCHEDULINGS="Spielverlegungen"
 COM_SPORTSMANAGER_MATCH_RESCHEDULING="Spielverlegung"
 COM_SPORTSMANAGER_MATCH_SWAPPING_HELP="Bei Heimrechttausch gleichen Termin eintragen"
 COM_SPORTSMANAGER_NOT_VALID_TIME="Ung&uuml;ltige Uhrzeit"
-COM_SPORTSMANAGER_REALLY_MATCH_RESCHEDULING="Willst Du diesen Spielverlegung wirklich entfernen?"
\ No newline at end of file
+COM_SPORTSMANAGER_REALLY_MATCH_RESCHEDULING="Willst Du diesen Spielverlegung wirklich entfernen?"
+COM_SPORTSMANAGER_REST_DAYS="Ruhetage"
+COM_SPORTSMANAGER_TRAINING_DAYS="Trainingstage"
\ No newline at end of file
diff --git a/src/structure/language/en-GB/en-GB.com_sportsmanager.ini b/src/structure/language/en-GB/en-GB.com_sportsmanager.ini
index ec0674a..a37841b 100644
--- a/src/structure/language/en-GB/en-GB.com_sportsmanager.ini
+++ b/src/structure/language/en-GB/en-GB.com_sportsmanager.ini
@@ -1067,4 +1067,6 @@ COM_SPORTSMANAGER_MATCH_RESCHEDULINGS="Match reschedulings"
 COM_SPORTSMANAGER_MATCH_RESCHEDULING="Match rescheduling"
 COM_SPORTSMANAGER_MATCH_SWAPPING_HELP="If home advantage is swapped, enter the same date"
 COM_SPORTSMANAGER_NOT_VALID_TIME="Not valid time"
-COM_SPORTSMANAGER_REALLY_MATCH_RESCHEDULING="Do you really want to remove this match rescheduling?"
\ No newline at end of file
+COM_SPORTSMANAGER_REALLY_MATCH_RESCHEDULING="Do you really want to remove this match rescheduling?"
+COM_SPORTSMANAGER_REST_DAYS="Rest days"
+COM_SPORTSMANAGER_TRAINING_DAYS="Training days"
\ No newline at end of file
diff --git a/src/structure/script.php b/src/structure/script.php
index f427f68..d1f2266 100644
--- a/src/structure/script.php
+++ b/src/structure/script.php
@@ -670,6 +670,9 @@ return new class () implements InstallerScriptInterface
 		. "\n  `ortsname` varchar(30) DEFAULT NULL,"
 		. "\n  `ortsteil` varchar(30) DEFAULT NULL,"
 		. "\n  `url` varchar(150) DEFAULT NULL,"
+		. "\n  `telefon` varchar(64) DEFAULT NULL,"
+		. "\n  `email` varchar(64) DEFAULT NULL,"
+		. "\n  `ruhetage` varchar(64) DEFAULT NULL,"
 		. "\n  `beschreibung` varchar(500) DEFAULT NULL,"
 		. "\n  `status` tinyint(1) NOT NULL DEFAULT '0',"
 		. "\n  PRIMARY KEY (`spielort_id`)"
@@ -692,6 +695,7 @@ return new class () implements InstallerScriptInterface
 		. "\n  `heimspiel_wochentag` tinyint(4) DEFAULT NULL,"
 		. "\n  `heimspiel_uhrzeit` smallint(6) DEFAULT NULL,"
 		. "\n  `heimspielort_id` int(11) DEFAULT NULL,"
+		. "\n  `trainingstage` varchar(64) DEFAULT NULL,"
 		. "\n  `nichtraucherschutz` tinyint(4) DEFAULT '0',"
 		. "\n  `platz` smallint(6) DEFAULT NULL,"
 		. "\n  `gesamtpunkte` float(6,2) DEFAULT NULL,"
@@ -1184,7 +1188,7 @@ return new class () implements InstallerScriptInterface
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
 
-		$query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'datenbank_version', wert = '115';";
+		$query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'datenbank_version', wert = '116';";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }