Update views + fixing entity-persisting code