Add "id" to the attribute fields, fix indentation.