Fixed a navigation bug through whole application.