finished implementing new layout for all emails