Updated Transition between pages (fixing up Router)