added mail address, reworked layout