Added layout of transaction and fix email setup