layout tweaks, email fix