* Improve animations
* Fix back navigation

