           HaveFav=false;
           for(int i = 0; i<10; i++)
                 {
-                  //NoFav
+                      //NoFav
                       if (EEPROM.read(EEPROM_ADR_TUNE_FAV[i])!=255)
-                      {  FirstFav=i+1;
+                      {  FirstFav=i;
                         HaveFav=true;
                         }
                 }
                 RefreshFav=true;
         //channel=channel_from_index(channelIndex); // get 0...48 index depending of current channel
-         }
- 
-           // handling of keys
+         }  // handling of keys
             if( digitalRead(buttonUp) == LOW)        // channel UP
             { 
               delay(KEY_DEBOUNCE); // debounce
                   lfavs++; 
-                  if (lfavs>10)
-                  {lfavs=FirstFav;}
+                  if (lfavs>FirstFav){lfavs=0;}
                  //Serial.println  ("UPEEPROM.read(EEPROM_ADR_TUNE_FAV[lfavs]) "); 
                  //Serial.print  (EEPROM.read(EEPROM_ADR_TUNE_FAV[lfavs]) );
                  //Serial.print  (" lfavs"); 
-                 // Serial.println  (lfavs );
-               
+                 //Serial.println  (lfavs );
+                  //Serial.print  (" FirstFav"); 
+                 //Serial.println  (FirstFav );
                     channelIndex=EEPROM.read(EEPROM_ADR_TUNE_FAV[lfavs]) ;
                     if (channelIndex!=255)
                      { 
-                      
-                    
-                        drawScreen.FavSel(lfavs);
+                        drawScreen.FavSel(lfavs+1);
                         channel=channel_from_index(channelIndex); // get 0...48 index depending of current channel
                         time_screen_saver=millis();
                         beep(50); // beep & debounce

            }

            ///LONG PRESS IN FAVORITES WILL DELETE THE CURRENT FAVORITE CHANNEL
            if  (state_last_used==STATE_FAVORITE )    
            {
              
              EEPROM.write(EEPROM_ADR_TUNE_FAV[lfavs],255);
              drawScreen.FavDelete(   pgm_read_word_near(channelFreqTable + channelIndex), lfavs);
              RefreshFav=false;
            }
              
                for (uint8_t loop=0;loop<5;loop++)
                {
                    beep(100); // beep

            } // end switch

            // draw mode select screen
            ////Serial.println (state);
            if (menu_id>4) 
            {drawScreen.mainMenuSecondPage(menu_id);}
            else
