Moved fade effects to their encapsulating class