Added email address name to subscription feature
Small view bug fix
cleanup