Final bug fixes to app navigation