Email screen and overall fixes