diff --git a/CHANGES.md b/CHANGES.md
index fc0ef3ae83..84f54727ac 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@
 
 - Fixed output of /v1/health/queue/certificates returning wrong data
 - Fixed network calculation for uploaded files
+- Fixed a UI bug preventing float values in numeric fields
 
 ## Security
 
diff --git a/app/views/console/database/collection.phtml b/app/views/console/database/collection.phtml
index c1e03402ce..8c6c75754d 100644
--- a/app/views/console/database/collection.phtml
+++ b/app/views/console/database/collection.phtml
@@ -457,7 +457,7 @@ $rules = $collection->getAttribute('rules', []);
 <script type="text/html" id="template-validation-numeric">
     <div class="margin-bottom">
         <label data-ls-attrs="for=rule-default-{{rule.$id}}">Default Value</label>
-        <input name="default" type="number" data-ls-bind="{{rule.default}}" data-cast-to="integer" placeholder="0" />
+        <input name="default" type="number" data-ls-bind="{{rule.default}}" data-cast-to="numeric" placeholder="0" step="any" />
     </div>
 </script>
 
diff --git a/app/views/console/database/rules/numeric.phtml b/app/views/console/database/rules/numeric.phtml
index 2f74331cf9..1a7774f427 100644
--- a/app/views/console/database/rules/numeric.phtml
+++ b/app/views/console/database/rules/numeric.phtml
@@ -4,4 +4,4 @@ $required = $this->getParam('required', '');
 $namespace = $this->getParam('namespace', '');
 ?>
 
-<input name="<?php echo $this->escape($key); ?>" type="number" autocomplete="off" data-ls-bind="{{<?php echo $this->escape($namespace); ?>}}" data-cast-to="integer"<?php if($required): ?> required<?php endif; ?> class="margin-bottom-no" />
\ No newline at end of file
+<input name="<?php echo $this->escape($key); ?>" type="number" autocomplete="off" data-ls-bind="{{<?php echo $this->escape($namespace); ?>}}" data-cast-to="numeric"<?php if($required): ?> required<?php endif; ?> class="margin-bottom-no" step=any />
\ No newline at end of file
diff --git a/app/views/console/settings/index.phtml b/app/views/console/settings/index.phtml
index e9e91d59c7..f38b91648e 100644
--- a/app/views/console/settings/index.phtml
+++ b/app/views/console/settings/index.phtml
@@ -27,8 +27,10 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
             <li data-state="/console/settings?project={{router.params.project}}">
                 <h2>Overview</h2>
 
-                <div class="row responsive">
+                <div class="row responsive margin-top-negative">
                     <div class="col span-8 margin-bottom">
+                        <label>&nbsp;</label>
+
                         <div class="box margin-bottom-large">
                             <form
                                 data-analytics-event="submit"
diff --git a/app/views/console/storage/index.phtml b/app/views/console/storage/index.phtml
index ea338e5d75..20b620deb6 100644
--- a/app/views/console/storage/index.phtml
+++ b/app/views/console/storage/index.phtml
@@ -36,7 +36,7 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                     data-failure="alert"
                     data-failure-param-alert-text="Failed to upload file"
                     data-failure-param-alert-classname="error">
-                    <input type="hidden" name="folderId" id="files-folderId" data-cast-to="int" value="1">
+                    <input type="hidden" name="folderId" id="files-folderId" data-cast-to="integer" value="1">
 
                     <label for="file-read">File</label>
                     <input type="file" name="file" id="file-file" size="1" required>
@@ -141,7 +141,7 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                                                         <div class="input-copy">
                                                             <input data-forms-copy type="text" data-ls-attrs="id=file-id-{{file.$id}}" name="fileId" disabled data-ls-bind="{{file.$id}}" />
                                                         </div>
-                                                        <input type="hidden" data-ls-attrs="id=file-folderId-{{file.$id}}" name="folderId" data-cast-to="int" value="1">
+                                                        <input type="hidden" data-ls-attrs="id=file-folderId-{{file.$id}}" name="folderId" data-cast-to="integer" value="1">
 
                                                         <label for="file-read">Read Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank">Learn more</a>)</label>
                                                         <input type="hidden" data-ls-attrs="id=file-read-{{file.$id}}" name="read" data-forms-tags data-cast-to="json" data-ls-bind="{{file.$permissions.read}}" placeholder="User ID, Team ID or Role" />
diff --git a/public/dist/scripts/app-all.js b/public/dist/scripts/app-all.js
index 8acc3d90d4..8a14e38f12 100644
--- a/public/dist/scripts/app-all.js
+++ b/public/dist/scripts/app-all.js
@@ -2509,7 +2509,7 @@ match=text.match(new RegExp(regex,'gi'))
 if(!match){return fail}
 for(i=0,len=match.length;i<len;i++){if(!process(match[i])){return fail}}
 return(date.getTime()/1000)}
-return{format:format,strtotime:strtotime}}(),true);})(window);(function(window){"use strict";window.ls.container.set('env',function(){return APP_ENV;},true);})(window);(function(window){"use strict";window.ls.container.set('form',function(){function cast(value,to){switch(to){case'int':case'integer':value=parseInt(value);break;case'string':value=value.toString();break;case'json':value=(value)?JSON.parse(value):[];break;case'array':value=(value&&value.constructor&&value.constructor===Array)?value:[value];break;case'array-empty':value=[];break;case'bool':case'boolean':value=(value==='false')?false:value;value=!!value;break;}
+return{format:format,strtotime:strtotime}}(),true);})(window);(function(window){"use strict";window.ls.container.set('env',function(){return APP_ENV;},true);})(window);(function(window){"use strict";window.ls.container.set('form',function(){function cast(value,to){switch(to){case'int':case'integer':value=parseInt(value);break;case'numeric':value=Number(value);break;case'string':value=value.toString();break;case'json':value=(value)?JSON.parse(value):[];break;case'array':value=(value&&value.constructor&&value.constructor===Array)?value:[value];break;case'array-empty':value=[];break;case'bool':case'boolean':value=(value==='false')?false:value;value=!!value;break;}
 return value;}
 function toJson(element,json){json=json||{};let name=element.getAttribute('name');let type=element.getAttribute('type');let castTo=element.getAttribute('data-cast-to');let ref=json;if(name&&'FORM'!==element.tagName){if('FIELDSET'===element.tagName){if(castTo==='object'){if(json[name]===undefined){json[name]={};}
 ref=json[name];}
diff --git a/public/dist/scripts/app.js b/public/dist/scripts/app.js
index 593cb4039c..654ac7dfc9 100644
--- a/public/dist/scripts/app.js
+++ b/public/dist/scripts/app.js
@@ -225,7 +225,7 @@ match=text.match(new RegExp(regex,'gi'))
 if(!match){return fail}
 for(i=0,len=match.length;i<len;i++){if(!process(match[i])){return fail}}
 return(date.getTime()/1000)}
-return{format:format,strtotime:strtotime}}(),true);})(window);(function(window){"use strict";window.ls.container.set('env',function(){return APP_ENV;},true);})(window);(function(window){"use strict";window.ls.container.set('form',function(){function cast(value,to){switch(to){case'int':case'integer':value=parseInt(value);break;case'string':value=value.toString();break;case'json':value=(value)?JSON.parse(value):[];break;case'array':value=(value&&value.constructor&&value.constructor===Array)?value:[value];break;case'array-empty':value=[];break;case'bool':case'boolean':value=(value==='false')?false:value;value=!!value;break;}
+return{format:format,strtotime:strtotime}}(),true);})(window);(function(window){"use strict";window.ls.container.set('env',function(){return APP_ENV;},true);})(window);(function(window){"use strict";window.ls.container.set('form',function(){function cast(value,to){switch(to){case'int':case'integer':value=parseInt(value);break;case'numeric':value=Number(value);break;case'string':value=value.toString();break;case'json':value=(value)?JSON.parse(value):[];break;case'array':value=(value&&value.constructor&&value.constructor===Array)?value:[value];break;case'array-empty':value=[];break;case'bool':case'boolean':value=(value==='false')?false:value;value=!!value;break;}
 return value;}
 function toJson(element,json){json=json||{};let name=element.getAttribute('name');let type=element.getAttribute('type');let castTo=element.getAttribute('data-cast-to');let ref=json;if(name&&'FORM'!==element.tagName){if('FIELDSET'===element.tagName){if(castTo==='object'){if(json[name]===undefined){json[name]={};}
 ref=json[name];}
diff --git a/public/scripts/services/form.js b/public/scripts/services/form.js
index 51386dce24..636c07b36f 100644
--- a/public/scripts/services/form.js
+++ b/public/scripts/services/form.js
@@ -9,6 +9,9 @@
                 case 'integer':
                     value = parseInt(value);
                     break;
+                case 'numeric':
+                    value = Number(value);
+                    break;
                 case 'string':
                     value = value.toString();
                     break;
diff --git a/public/styles/dependencies/prism.less b/public/styles/dependencies/prism.less
index 89da9c52e1..3343544848 100644
--- a/public/styles/dependencies/prism.less
+++ b/public/styles/dependencies/prism.less
@@ -14,6 +14,8 @@ https://prismjs.com/download.html#themes=prism-okaidia&languages=markup+css+clik
 	box-shadow: 0 2px 4px 0 rgba(50,50,93,.3);
 	border-radius: 10px;
 	margin-bottom: 30px;
+	&:extend(.force-left);
+	&:extend(.force-ltr);
 
 	* {
 		font-family: 'Source Code Pro', monospace;