Add maxlength attributes to editviewmodel
try merge
small fixes