Rejigger templates, add 403, 404 handling