Fade by menu fixes