Tidy markup for user edit form
Changed template content to new structure