#45: added mail icons and improved layout