Fixed regression on email and links look.
Cleanups.