add design fix and mail sender logic