Changes on 404 error page and property pages