Add 404 page and other fix