Entry view cleaning
Model update