styling and bug fixes
Merge branch 'multipleEmail' into testing