Refactor angular dataset fields ctrl, add custom_label field, update dataset fields builder and ctrl