Modified views, added validation with regexp