Correction on EAV ModelData
Many small improvements
A few changes in UI