Revert "cleaned some files"

This reverts commit c9d3b25692fa747995b38c9913e55f62681f4a18.
Ingredients import fixed
fixed data inconsistency and updates in view and edit