Faster animation and fixed navigation

Navigation bug fixed.

Also navigation is faster in app.