Fix Fade button + Improvement