Updated router for all the pages