Added 404 page, Fixed 404 handling