Changes to accomodate email widget.
Updates for round 3.