Revert "[IMP][website_mail] Improved data selectors and minor changes"

This reverts commit acb6eba9c0880404630de159141fec3894172005.