Form now formatting correctly and minor fixes to sender details