added email storage and show / hide setup