Add placeholder, fix field names and label display [MJ-680]