Add spinner
Fix number value if input is string