Fix router and add 404 and expired pages