Directive updates to be only on email
Success style fixes