Fix renaming and add column close, email