Removed underscore, added lodash, update models and views