Replace editable-fields with editable-inputs

And minor formatting.