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 ffc57ed..b307693 100644
--- a/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php
+++ b/src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php
@@ -8891,6 +8891,7 @@ class HTML_sportsmanager_admin
                 </tr>
                 <?php
 				$k = 0;
+				$monat = "...";
                 $Spieltagname = "";
 				$Spieltagname_Buffer = "";
                 foreach ($rows as $row) {
@@ -8919,26 +8920,25 @@ class HTML_sportsmanager_admin
 						}
 
 						$Spieltagname_Buffer = $Spieltagname;
-                        } else if ($monat != substr($row->zeitpunkt, 0, 7)) { // Freundschaftsspiel
-                            $monat = substr($row->zeitpunkt, 0, 7);
-                            if (strlen($monat) == 0)
-                                $monatsbezeichnung = "N/A";
-                            else {
-                                $monatsname = array(Text::_('COM_SPORTSMANAGER_JANUARY'), Text::_('COM_SPORTSMANAGER_FEBRUARY'), Text::_('COM_SPORTSMANAGER_MARCH'), Text::_('COM_SPORTSMANAGER_APRIL'), Text::_('COM_SPORTSMANAGER_MAY'), Text::_('COM_SPORTSMANAGER_JUNE'), Text::_('COM_SPORTSMANAGER_JULY'), Text::_('COM_SPORTSMANAGER_AUGUST'), Text::_('COM_SPORTSMANAGER_SEPTEMBER'), Text::_('COM_SPORTSMANAGER_OCTOBER'), Text::_('COM_SPORTSMANAGER_NOVEMBER'), Text::_('COM_SPORTSMANAGER_DECEMBER'));
-                                $monatsbezeichnung = $monatsname[substr($monat, 5, 2) - 1] . " " . substr($monat, 0, 4);
-                            }
-                            /* ?> <tr class="sectiontableheader<?php echo $params->get( 'pageclass_sfx' ); ?>"><td nowrap height="4"></td><td nowrap></td><td nowrap></td><td nowrap></td><td nowrap></td><td nowrap></td></tr> <?php */
-                            ?>
-                            <tr>
-                                <td nowrap height="4"></td>
-                            </tr>
-                            <tr class="sectiontableheader<?php echo $params->get('pageclass_sfx'); ?>" style="text-align: center">
-                                <th nowrap><span style="font-size: 70%; "><i>
-									<?php echo htmlentities_utf8($monatsbezeichnung); ?></i></span>
-                                </th>
-                            </tr> 
-							<?php
-                        }
+					} else if ($monat != substr($row->zeitpunkt, 0, 7)) {
+						$monat = substr($row->zeitpunkt, 0, 7);
+						if (strlen($monat) == 0)
+							$monatsbezeichnung = "N/A";
+						else {
+							$monatsname = array(Text::_('COM_SPORTSMANAGER_JANUARY'), Text::_('COM_SPORTSMANAGER_FEBRUARY'), Text::_('COM_SPORTSMANAGER_MARCH'), Text::_('COM_SPORTSMANAGER_APRIL'), Text::_('COM_SPORTSMANAGER_MAY'), Text::_('COM_SPORTSMANAGER_JUNE'), Text::_('COM_SPORTSMANAGER_JULY'), Text::_('COM_SPORTSMANAGER_AUGUST'), Text::_('COM_SPORTSMANAGER_SEPTEMBER'), Text::_('COM_SPORTSMANAGER_OCTOBER'), Text::_('COM_SPORTSMANAGER_NOVEMBER'), Text::_('COM_SPORTSMANAGER_DECEMBER'));
+							$monatsbezeichnung = $monatsname[substr($monat, 5, 2) - 1] . " " . substr($monat, 0, 4);
+						}
+						?>
+						<tr>
+							<td nowrap height="4"></td>
+						</tr>
+						<tr class="sectiontableheader<?php echo $params->get('pageclass_sfx'); ?>" style="text-align: center">
+							<th nowrap><span style="font-size: 70%; "><i>
+								<?php echo htmlentities_utf8($monatsbezeichnung); ?></i></span>
+							</th>
+						</tr> 
+						<?php
+					}
 					?>
 						
 						
@@ -9144,7 +9144,7 @@ class HTML_sportsmanager_admin
                                         </td>
                                         <td nowrap>
                                             <input list="auswahl_spieltagtitel" class="uk-select uk-form-width-medium" type="text" name="spieltag_titel"
-                                                   id="game_title" size="32" maxlength="20" style="height: 34px;width: 300px;"
+                                                   id="game_title" size="32" maxlength="20" style="height: 34px;width: 300px;" size="1"
                                                    value="<?php if ($row != null) echo htmlentities_utf8($row->spieltag_titel); ?>"/>
 											<datalist id="auswahl_spieltagtitel" >
 											<?php if ($auswahl_spieltagtitel){ ?>
@@ -9163,8 +9163,8 @@ class HTML_sportsmanager_admin
                                         </td>
                                         <td nowrap>
 											<?php if ($neuer_eintrag) {$row->spiel_nr = "";} ?>
-                                            <select class="uk-select uk-form-width-xsmall" style="height: 34px;" id="game_nr" type="number" 
-													title="Spielnummer (optional)" name="spiel_nr" value=<?php $row->spiel_nr = ($neuer_eintrag == 0 ? $row->spiel_nr : ""); ?>/>
+                                            <select class="uk-select uk-form-width-xsmall" id="game_nr" size="1"
+													title="Spielnummer (optional)" name="spiel_nr">
 											<option value=""></option>
                                                 <?php
                                                 for ($i = 1; $i <= 99; $i++) 
@@ -10332,9 +10332,8 @@ class HTML_sportsmanager_admin
                                                 <?php if ($teamnr == 1) echo Text::_('COM_SPORTSMANAGER_PAIRINGS') . ":"; ?>
                                             </td>
                                             <td nowrap>
-												<select class="uk-select uk-form-width-xsmall" style="height: 34px;" id="game_nr" 
-														type="number" name="spiel_nr_<?php echo $teamnr; ?>" 
-														value=<?php echo $row->spiel_nr; ?> title="Spielnummer (optional)"/>
+												<select class="uk-select uk-form-width-xsmall" size="1" id="game_nr" 
+														name="spiel_nr_<?php echo $teamnr; ?>" title="Spielnummer (optional)">
 												<option value=""></option>
 													<?php
 													for ($i = 1; $i <= 99; $i++)