Fixed Navigation Issue.
Persist state on url