Add the labels to the fields in the add/edit entry pages
Merged conflict