Minor UI changes for custom layout and email header