Change animation in mobile app to fade.
Some small refactoring - that -> this.