Fixed modal link problem
Updated router function. Added page-load handler for router.