* Navigation improvements

* App stability improvements and bug fixing

