Move around templates. Fix events bug.