More updates for 404 and 500 page