Updated w email addr and better icons