improve navigation. with out full refresh