Fix fields and button labels
as well as notifications