Some template/controller changes.