Minor cleanup + adding email form.