update for 404 and 500 pages
improvements