added email link, fixed up listing view
fix conflicts