change router and add urlFroCurrent()