Minor layout fixes on submission and email