diff --git a/templates/index.html b/templates/index.html
index d10dc23..2f604f9 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -669,11 +669,16 @@
         <div class="tournament-actions">
           <a href="/tournament/draft" class="nav-link tournament-btn">📋 <span data-i18n="tournament.view_full_tournament_draft">Oglej si Celoten Žreb Turnirja</span></a>
           <a href="/tournament" class="nav-link tournament-btn" id="manageTournamentLink">⚙️ <span data-i18n="tournament.manage_tournament">Upravljaj Turnir</span></a>
-          <a href="/results/calculator" class="nav-link tournament-btn">🎯 <span data-i18n="scoring.results_calculator">Calculator</span></a>
         </div>
       </div>
       {% endif %}
 
+      {% if settings.tournament_active %}
+      <div class="settings-group">
+        <a href="/results/calculator" class="nav-link tournament-btn">🎯 <span data-i18n="scoring.results_calculator">Calculator</span></a>
+      </div>
+      {% endif %}
+
       <!-- Tournaments Section -->
       <div class="settings-group">
         <h4 data-i18n="league.tournaments">Turnirji</h4>
diff --git a/templates/tournament.html b/templates/tournament.html
index bb37e76..4796907 100644
--- a/templates/tournament.html
+++ b/templates/tournament.html
@@ -1487,7 +1487,7 @@
       {% if tournament_state %}
         <a href="/tournament/draft" class="nav-btn">📋 <span data-i18n="tournament.view_draft">Draft</span></a>
       {% endif %}
-      {% if league_state or tournament_state %}
+      {% if tournament_state %}
         <a href="/results/calculator" class="nav-btn">🎯 <span data-i18n="navigation.calculator">Results Calculator</span></a>
       {% endif %}
     </div>
@@ -2078,15 +2078,25 @@
     function renderPlayerTable() {
       const tbody = document.getElementById('playerTableBody');
       const noResults = document.getElementById('noResults');
+
+      // Check if playerTableBody exists before proceeding (it may not exist on all pages)
+      if (!tbody) {
+        return;
+      }
+
       const filteredPlayers = getFilteredPlayers();
-      
+
       tbody.innerHTML = '';
-      
+
       if (filteredPlayers.length === 0) {
-        noResults.style.display = 'block';
+        if (noResults) {
+          noResults.style.display = 'block';
+        }
         return;
       } else {
-        noResults.style.display = 'none';
+        if (noResults) {
+          noResults.style.display = 'none';
+        }
       }
 
       filteredPlayers.forEach(player => {
diff --git a/tv_app.py b/tv_app.py
index b71edeb..549a56e 100644
--- a/tv_app.py
+++ b/tv_app.py
@@ -689,7 +689,7 @@ def index():
     
     # Check if tournament is active and get current round players
     current_round_data = get_current_round_data()
-    
+
     # If tournament is active, override camera titles with player names
     if current_round_data:
         tournament_titles = {}
@@ -723,9 +723,16 @@ def index():
         display_settings['tournament_active'] = False
         display_settings['current_round'] = 1
         display_settings['total_rounds'] = 1
-        display_settings['league_active'] = False
-    
- 
+
+        # Check if league is active when tournament is not
+        league_state = load_league_state()
+        if league_state:
+            display_settings['league_active'] = True
+            display_settings['league_tournament'] = league_state.get('current_tournament', 1)
+            display_settings['league_total'] = league_state.get('total_tournaments', 6)
+        else:
+            display_settings['league_active'] = False
+
     return render_template('index.html',
                          streams=STREAMS,
                          settings=display_settings,