Prettier email links and attempt to fix bug