diff --git a/src/core/Render.js b/src/core/Render.js
index 392c4fa..a4cc127 100644
--- a/src/core/Render.js
+++ b/src/core/Render.js
@@ -567,7 +567,7 @@ export class Render {
 
 		let inputWrapper = null;
 
-		if (field.type == 'text' || field.type == 'password' || field.type == 'select') {
+		if (field.type == 'text' || field.type == 'number' || field.type == 'password' || field.type == 'select') {
 			
 			inputWrapper = El('div', { className: 'input-wrapper' });
 
@@ -641,22 +641,6 @@ export class Render {
 		return input;
 	}
 
-	/**
-	* Make Input Password Element
-	*/
-	static makeInputPwdElement(field, parent) {
-
-		let elem = El('input', { type: 'password', className: 'sp-form-control' });
-
-		
-
-		Render.setInputAttr(elem, field);
-
-		Render.makeFieldWrapper(field, parent).append(elem);
-
-		return elem;
-	}
-
 	/**
 	* Make Textarea Element
 	*/
@@ -833,8 +817,6 @@ export class Render {
 				input.checked = (val == field.value);
 			}
 
-			input.value = val;
-
 			let label = El('label', {}, input, El('span', { className: 'ctrl-indicator' }), text);
 
 			label.className = 'radio-label';
@@ -890,8 +872,6 @@ export class Render {
 
 			Render.setInputAttr(input, field);
 
-			input.value = val;
-
 			input.checked = (val == field.value);
 
 			label.append(input);