Navigation fixes (Mobile)