Final bug fixes in app activities navigation