DEP-22 fix mobile navigation