Important changes, templates and 404 handler