Unneeded conditional
Fade fix
Add fade button