fixed animation, refactored
Merge https://github.com/ostapkoziy/nravo-android