Add info to view pages and fix test
fix merge conflict
Merge pull request #52 from jereln/email_config

Add info to view pages and fix test