navigation improvement, still bugs(on refresh for instance)