Fades when zooming, refactoring