layout changes, email fix, editing