Added titles and fixed some spacing, also added 'email' and 'password' data-editors
resolves merge