diff --git a/app/scripts/directives/editRequestLimit.js b/app/scripts/directives/editRequestLimit.js
index 7490bb5b67..6f95ead7ff 100644
--- a/app/scripts/directives/editRequestLimit.js
+++ b/app/scripts/directives/editRequestLimit.js
@@ -68,21 +68,34 @@ angular.module('openshiftConsole')
         case 'memory':
           scope.input.unit = 'Mi';
           scope.units = [{
-            value: "M",
-            label: "MB"
-          }, {
-            value: "G",
-            label: "GB"
-          }, {
             value: "Mi",
             label: "MiB"
           }, {
             value: "Gi",
             label: "GiB"
+          }, {
+            value: "M",
+            label: "MB"
+          }, {
+            value: "G",
+            label: "GB"
           }];
           break;
         }
 
+        scope.groupUnits = function(unit) {
+          switch (unit.value) {
+          case 'Mi':
+          case 'Gi':
+            return 'Binary Units';
+          case 'M':
+          case 'G':
+            return 'Decimal Units';
+          }
+
+          return '';
+        };
+
         var validateLimitRange = function() {
           // Use usageValue filter to normalize units for comparison.
           var value = scope.input.amount && usageValue(scope.input.amount + scope.input.unit),
diff --git a/app/scripts/directives/oscPersistentVolumeClaim.js b/app/scripts/directives/oscPersistentVolumeClaim.js
index d433b4066f..3e3fd01b79 100644
--- a/app/scripts/directives/oscPersistentVolumeClaim.js
+++ b/app/scripts/directives/oscPersistentVolumeClaim.js
@@ -1,7 +1,9 @@
 "use strict";
 
 angular.module("openshiftConsole")
-  .directive("oscPersistentVolumeClaim", function(DataService){
+  .directive("oscPersistentVolumeClaim",
+             function(DataService,
+                      ModalsService) {
     return {
       restrict: 'E',
       scope: {
@@ -10,7 +12,7 @@ angular.module("openshiftConsole")
       templateUrl: 'views/directives/osc-persistent-volume-claim.html',
       link: function(scope) {
         scope.storageClasses = [];
-        scope.claim.unit = 'Mi';
+        scope.claim.unit = 'Gi';
         scope.units = [{
           value: "Mi",
           label: "MiB"
@@ -21,10 +23,36 @@ angular.module("openshiftConsole")
           value: "Ti",
           label: "TiB"
         }, {
-          value: "Pi",
-          label: "PiB"
+          value: "M",
+          label: "MB"
+        }, {
+          value: "G",
+          label: "GB"
+        }, {
+          value: "T",
+          label: "TB"
         }];
         scope.claim.selectedLabels = [];
+
+        scope.groupUnits = function(unit) {
+          switch (unit.value) {
+          case 'Mi':
+          case 'Gi':
+          case 'Ti':
+            return 'Binary Units';
+          case 'M':
+          case 'G':
+          case 'T':
+            return 'Decimal Units';
+          }
+
+          return '';
+        };
+
+        scope.showComputeUnitsHelp = function() {
+          ModalsService.showComputeUnitsHelp();
+        };
+
         DataService.list({group: 'storage.k8s.io', resource: 'storageclasses'}, {}, function(storageClasses) {
           scope.storageClasses = storageClasses.by('metadata.name');
         }, {errorNotification: false});
diff --git a/app/styles/_select.less b/app/styles/_select.less
index 7326facce3..9e5b37238a 100644
--- a/app/styles/_select.less
+++ b/app/styles/_select.less
@@ -35,6 +35,10 @@
     min-height: 24px;
     cursor: pointer;
   }
+  .ui-select-choices-group-label:empty {
+    // Prevent extra space above the first choice when the group label is empty.
+    padding: 0;
+  }
   .ui-select-match-text, .ui-select-placeholder {
     font-weight: normal;
   }
diff --git a/app/views/_compute-resource.html b/app/views/_compute-resource.html
index 80c1616680..70d481428b 100644
--- a/app/views/_compute-resource.html
+++ b/app/views/_compute-resource.html
@@ -17,7 +17,7 @@
         <label class="sr-only" ng-attr-for="{{id}}-unit">Unit</label>
         <ui-select search-enabled="false" ng-model="input.unit" input-id="{{id}}-unit">
           <ui-select-match>{{$select.selected.label}}</ui-select-match>
-          <ui-select-choices repeat="option.value as option in units">
+          <ui-select-choices repeat="option.value as option in units" group-by="groupUnits">
             {{option.label}}
           </ui-select-choices>
         </ui-select>
diff --git a/app/views/directives/osc-persistent-volume-claim.html b/app/views/directives/osc-persistent-volume-claim.html
index 43b465cbd6..1560f60336 100644
--- a/app/views/directives/osc-persistent-volume-claim.html
+++ b/app/views/directives/osc-persistent-volume-claim.html
@@ -38,21 +38,23 @@
     <!-- Name -->
     <div class="form-group">
       <label for="claim-name" class="required">Name</label>
-      <input
-        id="claim-name"
-        class="form-control"
-        type="text"
-        name="name"
-        ng-model="claim.name"
-        ng-required="true"
-        ng-pattern="/^[a-z0-9]([-a-z0-9]*[a-z0-9])?$/"
-        ng-maxlength="253"
-        placeholder="my-storage-claim"
-        select-on-focus
-        autocorrect="off"
-        autocapitalize="off"
-        spellcheck="false"
-        aria-describedby="claim-name-help">
+      <span ng-class="{ 'has-error': persistentVolumeClaimForm.name.$invalid && persistentVolumeClaimForm.name.$touched && !claimDisabled }">
+        <input
+          id="claim-name"
+          class="form-control"
+          type="text"
+          name="name"
+          ng-model="claim.name"
+          ng-required="true"
+          ng-pattern="/^[a-z0-9]([-a-z0-9]*[a-z0-9])?$/"
+          ng-maxlength="253"
+          placeholder="my-storage-claim"
+          select-on-focus
+          autocorrect="off"
+          autocapitalize="off"
+          spellcheck="false"
+          aria-describedby="claim-name-help">
+      </span>
       <div>
         <span id="claim-name-help" class="help-block">A unique name for the storage claim within the project.</span>
       </div>
@@ -92,38 +94,46 @@
     <!-- capacity -->
     <div class="form-group">
       <fieldset class="form-inline compute-resource">
-      <label class="required">Size</label>
-      <div class="resource-size" ng-class="{ 'has-error': form.$invalid }">
-        <div class="resource-amount">
-          <label class="sr-only">Amount</label>
-          <input type="number"
-                 name="amount"
-                 ng-attr-id="claim-amount"
-                 ng-model="claim.amount"
-                 ng-required="true"
-                 min="0"
-                 ng-attr-placeholder="10"
-                 class="form-control"
-                 ng-attr-aria-describedby="claim-capacity-help">
+        <label class="required">Size</label>
+        <div class="resource-size">
+          <div class="resource-amount" ng-class="{ 'has-error': persistentVolumeClaimForm.capacity.$invalid && persistentVolumeClaimForm.capacity.$touched && !claimDisabled }">
+            <label class="sr-only">Amount</label>
+            <input type="number"
+                   name="capacity"
+                   ng-attr-id="claim-amount"
+                   ng-model="claim.amount"
+                   ng-required="true"
+                   min="0"
+                   ng-attr-placeholder="10"
+                   class="form-control"
+                   ng-attr-aria-describedby="claim-capacity-help">
+          </div>
+          <div class="resource-unit">
+            <label class="sr-only" >Unit</label>
+            <ui-select search-enabled="false" ng-model="claim.unit" input-id="claim-capacity-unit">
+              <ui-select-match>{{$select.selected.label}}</ui-select-match>
+              <ui-select-choices repeat="option.value as option in units" group-by="groupUnits">
+                {{option.label}}
+              </ui-select-choices>
+            </ui-select>
+          </div>
+         </div>
+         <div id="claim-capacity-help" class="help-block">
+           Desired storage capacity.
         </div>
-        <div class="resource-unit">
-          <label class="sr-only" >Unit</label>
-          <ui-select search-enabled="false" ng-model="claim.unit" input-id="claim-capacity-unit">
-            <ui-select-match>{{$select.selected.label}}</ui-select-match>
-            <ui-select-choices repeat="option.value as option in units">
-              {{option.label}}
-            </ui-select-choices>
-          </ui-select>
+        <div class="has-error" ng-show="persistentVolumeClaimForm.capacity.$error.number && persistentVolumeClaimForm.capacity.$touched && !claimDisabled">
+          <span class="help-block">
+            Must be a number.
+          </span>
+        </div>
+        <div class="has-error" ng-show="persistentVolumeClaimForm.capacity.$error.min && persistentVolumeClaimForm.capacity.$touched && !claimDisabled">
+          <span class="help-block">
+            Must be a positive number.
+          </span>
+        </div>
+        <div class="learn-more-block mar-top-sm">
+          <a href="" ng-click="showComputeUnitsHelp()">What are GiB?</a>
         </div>
-       </div>
-       <div id="claim-capacity-help" class="help-block">
-         Desired storage capacity.
-      </div>
-      <div class="has-error" ng-show="persistentVolumeClaimForm.capacity.$error.pattern && persistentVolumeClaimForm.capacity.$touched && !claimDisabled">
-        <span class="help-block">
-          Must be a positive integer.
-        </span>
-      </div>
       </fieldset>
     </div>
     <!--advanced options-->
diff --git a/app/views/modals/about-compute-units-modal.html b/app/views/modals/about-compute-units-modal.html
index a616c7c6ad..7fa832d5b8 100644
--- a/app/views/modals/about-compute-units-modal.html
+++ b/app/views/modals/about-compute-units-modal.html
@@ -22,11 +22,11 @@ <h3>CPU</h3>
 1000 millcores  =  1 core
 </pre>
 
-    <h3>Memory</h3>
+    <h3>Memory and Storage</h3>
 
     <p>
-      Memory is measured in binary units like <var>KiB</var>, <var>MiB</var>, and <var>GiB</var> or
-      decimal units like <var>kB</var>, <var>MB</var>, and&nbsp;<var>GB</var>.
+      Memory and storage are measured in binary units like <var>KiB</var>, <var>MiB</var>, <var>GiB</var>, and <var>TiB</var> or
+      decimal units like <var>kB</var>, <var>MB</var>, <var>GB</var>, and&nbsp;<var>TB</var>.
     </p>
 
     <div class="row">
@@ -36,6 +36,7 @@ <h4>Binary Units</h4>
 1024 bytes  =  1 KiB
 1024 KiB    =  1 MiB
 1024 MiB    =  1 GiB
+1024 GiB    =  1 TiB
 </pre>
       </div>
       <div class="col-sm-6">
@@ -44,6 +45,7 @@ <h4>Decimal Units</h4>
 1000 bytes  =  1 kB
 1000 kB     =  1 MB
 1000 MB     =  1 GB
+1000 GB     =  1 TB
 </pre>
       </div>
     </div>
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
index 43c490375b..6be54b17cf 100644
--- a/dist/scripts/scripts.js
+++ b/dist/scripts/scripts.js
@@ -10063,15 +10063,15 @@ _.set(a, "model.service", c);
 });
 }
 };
-}), angular.module("openshiftConsole").directive("oscPersistentVolumeClaim", [ "DataService", function(a) {
+}), angular.module("openshiftConsole").directive("oscPersistentVolumeClaim", [ "DataService", "ModalsService", function(a, b) {
 return {
 restrict:"E",
 scope:{
 claim:"=model"
 },
 templateUrl:"views/directives/osc-persistent-volume-claim.html",
-link:function(b) {
-b.storageClasses = [], b.claim.unit = "Mi", b.units = [ {
+link:function(c) {
+c.storageClasses = [], c.claim.unit = "Gi", c.units = [ {
 value:"Mi",
 label:"MiB"
 }, {
@@ -10081,13 +10081,34 @@ label:"GiB"
 value:"Ti",
 label:"TiB"
 }, {
-value:"Pi",
-label:"PiB"
-} ], b.claim.selectedLabels = [], a.list({
+value:"M",
+label:"MB"
+}, {
+value:"G",
+label:"GB"
+}, {
+value:"T",
+label:"TB"
+} ], c.claim.selectedLabels = [], c.groupUnits = function(a) {
+switch (a.value) {
+case "Mi":
+case "Gi":
+case "Ti":
+return "Binary Units";
+
+case "M":
+case "G":
+case "T":
+return "Decimal Units";
+}
+return "";
+}, c.showComputeUnitsHelp = function() {
+b.showComputeUnitsHelp();
+}, a.list({
 group:"storage.k8s.io",
 resource:"storageclasses"
 }, {}, function(a) {
-b.storageClasses = a.by("metadata.name");
+c.storageClasses = a.by("metadata.name");
 }, {
 errorNotification:!1
 });
@@ -12461,19 +12482,31 @@ break;
 
 case "memory":
 b.input.unit = "Mi", b.units = [ {
-value:"M",
-label:"MB"
-}, {
-value:"G",
-label:"GB"
-}, {
 value:"Mi",
 label:"MiB"
 }, {
 value:"Gi",
 label:"GiB"
+}, {
+value:"M",
+label:"MB"
+}, {
+value:"G",
+label:"GB"
 } ];
 }
+b.groupUnits = function(a) {
+switch (a.value) {
+case "Mi":
+case "Gi":
+return "Binary Units";
+
+case "M":
+case "G":
+return "Decimal Units";
+}
+return "";
+};
 var j = function() {
 var a = b.input.amount && f(b.input.amount + b.input.unit), c = b.limitRangeMin && f(b.limitRangeMin), d = b.limitRangeMax && f(b.limitRangeMax), e = !0, g = !0;
 a && c && (e = a >= c), a && d && (g = a <= d), b.form.amount.$setValidity("limitRangeMin", e), b.form.amount.$setValidity("limitRangeMax", g);
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index 880f9fd261..6bb2be38c4 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -81,7 +81,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<label class=\"sr-only\" ng-attr-for=\"{{id}}-unit\">Unit</label>\n" +
     "<ui-select search-enabled=\"false\" ng-model=\"input.unit\" input-id=\"{{id}}-unit\">\n" +
     "<ui-select-match>{{$select.selected.label}}</ui-select-match>\n" +
-    "<ui-select-choices repeat=\"option.value as option in units\">\n" +
+    "<ui-select-choices repeat=\"option.value as option in units\" group-by=\"groupUnits\">\n" +
     "{{option.label}}\n" +
     "</ui-select-choices>\n" +
     "</ui-select>\n" +
@@ -7534,7 +7534,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "\n" +
     "<div class=\"form-group\">\n" +
     "<label for=\"claim-name\" class=\"required\">Name</label>\n" +
+    "<span ng-class=\"{ 'has-error': persistentVolumeClaimForm.name.$invalid && persistentVolumeClaimForm.name.$touched && !claimDisabled }\">\n" +
     "<input id=\"claim-name\" class=\"form-control\" type=\"text\" name=\"name\" ng-model=\"claim.name\" ng-required=\"true\" ng-pattern=\"/^[a-z0-9]([-a-z0-9]*[a-z0-9])?$/\" ng-maxlength=\"253\" placeholder=\"my-storage-claim\" select-on-focus autocorrect=\"off\" autocapitalize=\"off\" spellcheck=\"false\" aria-describedby=\"claim-name-help\">\n" +
+    "</span>\n" +
     "<div>\n" +
     "<span id=\"claim-name-help\" class=\"help-block\">A unique name for the storage claim within the project.</span>\n" +
     "</div>\n" +
@@ -7568,16 +7570,16 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"form-group\">\n" +
     "<fieldset class=\"form-inline compute-resource\">\n" +
     "<label class=\"required\">Size</label>\n" +
-    "<div class=\"resource-size\" ng-class=\"{ 'has-error': form.$invalid }\">\n" +
-    "<div class=\"resource-amount\">\n" +
+    "<div class=\"resource-size\">\n" +
+    "<div class=\"resource-amount\" ng-class=\"{ 'has-error': persistentVolumeClaimForm.capacity.$invalid && persistentVolumeClaimForm.capacity.$touched && !claimDisabled }\">\n" +
     "<label class=\"sr-only\">Amount</label>\n" +
-    "<input type=\"number\" name=\"amount\" ng-attr-id=\"claim-amount\" ng-model=\"claim.amount\" ng-required=\"true\" min=\"0\" ng-attr-placeholder=\"10\" class=\"form-control\" ng-attr-aria-describedby=\"claim-capacity-help\">\n" +
+    "<input type=\"number\" name=\"capacity\" ng-attr-id=\"claim-amount\" ng-model=\"claim.amount\" ng-required=\"true\" min=\"0\" ng-attr-placeholder=\"10\" class=\"form-control\" ng-attr-aria-describedby=\"claim-capacity-help\">\n" +
     "</div>\n" +
     "<div class=\"resource-unit\">\n" +
     "<label class=\"sr-only\">Unit</label>\n" +
     "<ui-select search-enabled=\"false\" ng-model=\"claim.unit\" input-id=\"claim-capacity-unit\">\n" +
     "<ui-select-match>{{$select.selected.label}}</ui-select-match>\n" +
-    "<ui-select-choices repeat=\"option.value as option in units\">\n" +
+    "<ui-select-choices repeat=\"option.value as option in units\" group-by=\"groupUnits\">\n" +
     "{{option.label}}\n" +
     "</ui-select-choices>\n" +
     "</ui-select>\n" +
@@ -7586,11 +7588,19 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div id=\"claim-capacity-help\" class=\"help-block\">\n" +
     "Desired storage capacity.\n" +
     "</div>\n" +
-    "<div class=\"has-error\" ng-show=\"persistentVolumeClaimForm.capacity.$error.pattern && persistentVolumeClaimForm.capacity.$touched && !claimDisabled\">\n" +
+    "<div class=\"has-error\" ng-show=\"persistentVolumeClaimForm.capacity.$error.number && persistentVolumeClaimForm.capacity.$touched && !claimDisabled\">\n" +
+    "<span class=\"help-block\">\n" +
+    "Must be a number.\n" +
+    "</span>\n" +
+    "</div>\n" +
+    "<div class=\"has-error\" ng-show=\"persistentVolumeClaimForm.capacity.$error.min && persistentVolumeClaimForm.capacity.$touched && !claimDisabled\">\n" +
     "<span class=\"help-block\">\n" +
-    "Must be a positive integer.\n" +
+    "Must be a positive number.\n" +
     "</span>\n" +
     "</div>\n" +
+    "<div class=\"learn-more-block mar-top-sm\">\n" +
+    "<a href=\"\" ng-click=\"showComputeUnitsHelp()\">What are GiB?</a>\n" +
+    "</div>\n" +
     "</fieldset>\n" +
     "</div>\n" +
     "\n" +
@@ -9825,9 +9835,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<pre>\n" +
     "1000 millcores  =  1 core\n" +
     "</pre>\n" +
-    "<h3>Memory</h3>\n" +
+    "<h3>Memory and Storage</h3>\n" +
     "<p>\n" +
-    "Memory is measured in binary units like <var>KiB</var>, <var>MiB</var>, and <var>GiB</var> or decimal units like <var>kB</var>, <var>MB</var>, and&nbsp;<var>GB</var>.\n" +
+    "Memory and storage are measured in binary units like <var>KiB</var>, <var>MiB</var>, <var>GiB</var>, and <var>TiB</var> or decimal units like <var>kB</var>, <var>MB</var>, <var>GB</var>, and&nbsp;<var>TB</var>.\n" +
     "</p>\n" +
     "<div class=\"row\">\n" +
     "<div class=\"col-sm-6\">\n" +
@@ -9836,6 +9846,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "1024 bytes  =  1 KiB\n" +
     "1024 KiB    =  1 MiB\n" +
     "1024 MiB    =  1 GiB\n" +
+    "1024 GiB    =  1 TiB\n" +
     "</pre>\n" +
     "</div>\n" +
     "<div class=\"col-sm-6\">\n" +
@@ -9844,6 +9855,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "1000 bytes  =  1 kB\n" +
     "1000 kB     =  1 MB\n" +
     "1000 MB     =  1 GB\n" +
+    "1000 GB     =  1 TB\n" +
     "</pre>\n" +
     "</div>\n" +
     "</div>\n" +
diff --git a/dist/styles/main.css b/dist/styles/main.css
index d44cf0e3e8..ad60c483a7 100644
--- a/dist/styles/main.css
+++ b/dist/styles/main.css
@@ -4762,6 +4762,7 @@ td.visible-print,th.visible-print{display:table-cell!important}
 .ui-select-bootstrap .ui-select-choices-row.active>span{background-color:#0088ce!important;border-color:#0088ce!important;color:#fff}
 .ui-select-bootstrap .ui-select-choices-row.active .text-muted{color:#f5f5f5}
 .ui-select-bootstrap .ui-select-choices-row-inner{min-height:24px;cursor:pointer}
+.ui-select-bootstrap .ui-select-choices-group-label:empty{padding:0}
 .ui-select-bootstrap .ui-select-match-text,.ui-select-bootstrap .ui-select-placeholder{font-weight:400}
 .ui-select-bootstrap .ui-select-match-text{padding-right:20px}
 .ui-select-bootstrap .ui-select-match-text span{display:block;text-overflow:ellipsis}