[#76238418] Implemented email collection for beta; Heavy style changes