diff --git a/client/src/components/Forms/InputPrependText.js b/client/src/components/Forms/InputPrependText.js
new file mode 100644
index 000000000..77a581f3f
--- /dev/null
+++ b/client/src/components/Forms/InputPrependText.js
@@ -0,0 +1,9 @@
+import React from 'react';
+
+export default function InputPrependText({ text, children }) {
+  return (
+    <div class="input-group-prepend">
+      <span class="input-group-text">{text}</span>
+    </div>
+  );
+}
diff --git a/client/src/components/index.js b/client/src/components/index.js
index e58492757..b63866c18 100644
--- a/client/src/components/index.js
+++ b/client/src/components/index.js
@@ -39,6 +39,7 @@ import MoneyInputGroup from './MoneyInputGroup';
 import Dragzone from './Dragzone';
 import EmptyStatus from './EmptyStatus';
 import DashboardCard from './Dashboard/DashboardCard';
+import InputPrependText from './Forms/InputPrependText';
 
 const Hint = FieldHint;
 
@@ -84,4 +85,5 @@ export {
   Dragzone,
   EmptyStatus,
   DashboardCard,
+  InputPrependText,
 };
diff --git a/client/src/containers/Customers/CustomerFinancialPanel.js b/client/src/containers/Customers/CustomerFinancialPanel.js
index bea09ca4d..c8a0d39c8 100644
--- a/client/src/containers/Customers/CustomerFinancialPanel.js
+++ b/client/src/containers/Customers/CustomerFinancialPanel.js
@@ -75,9 +75,7 @@ function CustomerFinancialPanel({
                 <MoneyInputGroup
                   value={value}
                   prefix={'$'}
-                  inputGroupProps={{
-                    fill: true,
-                  }}
+                  inputGroupProps={{ fill: true }}
                   disabled={customerId}
                   {...field}
                 />
diff --git a/client/src/containers/Items/ItemForm.js b/client/src/containers/Items/ItemForm.js
index b101750b2..3d0a5c933 100644
--- a/client/src/containers/Items/ItemForm.js
+++ b/client/src/containers/Items/ItemForm.js
@@ -37,7 +37,7 @@ const defaultInitialValues = {
   inventory_account_id: '',
   category_id: '',
   note: '',
-  sellable: true,
+  sellable: 1,
   purchasable: true,
 };
 
diff --git a/client/src/containers/Items/ItemFormBody.js b/client/src/containers/Items/ItemFormBody.js
index 764e8d3be..274930060 100644
--- a/client/src/containers/Items/ItemFormBody.js
+++ b/client/src/containers/Items/ItemFormBody.js
@@ -1,34 +1,33 @@
 import React from 'react';
 import { FastField, Field, ErrorMessage } from 'formik';
-import {
-  FormGroup,
-  Classes,
-  Checkbox,
-} from '@blueprintjs/core';
+import { FormGroup, Classes, Checkbox, ControlGroup } from '@blueprintjs/core';
 import {
   AccountsSelectList,
   MoneyInputGroup,
   Col,
   Row,
   Hint,
+  InputPrependText,
 } from 'components';
 import { FormattedMessage as T } from 'react-intl';
 import classNames from 'classnames';
+
 import withAccounts from 'containers/Accounts/withAccounts';
+import withSettings from 'containers/Settings/withSettings';
 
 import { compose, inputIntent } from 'utils';
 
 /**
  * Item form body.
  */
-function ItemFormBody({ accountsList }) {
+function ItemFormBody({ accountsList, baseCurrency }) {
   return (
     <div class="page-form__section page-form__section--selling-cost">
       <Row>
         <Col xs={6}>
           {/*------------- Purchasable checbox ------------- */}
           <FastField name={'sellable'} type="checkbox">
-            {({ field: { onChange, onBlur, name, checked } }) => (
+            {({ field }) => (
               <FormGroup inline={true} className={'form-group--sellable'}>
                 <Checkbox
                   inline={true}
@@ -38,17 +37,15 @@ function ItemFormBody({ accountsList }) {
                     </h3>
                   }
                   name={'sellable'}
-                  checked={!!checked}
-                  onChange={onChange}
-                  onBlur={onBlur}
+                  {...field}
                 />
               </FormGroup>
             )}
           </FastField>
 
           {/*------------- Selling price ------------- */}
-          <FastField name={'sell_price'}>
-            {({ form, field, field: { value }, meta: { error, touched } }) => (
+          <Field name={'sell_price'}>
+            {({ form, field: { value }, meta: { error, touched } }) => (
               <FormGroup
                 label={<T id={'selling_price'} />}
                 className={'form-group--sell_price'}
@@ -56,21 +53,23 @@ function ItemFormBody({ accountsList }) {
                 helperText={<ErrorMessage name={'sell_price'} />}
                 inline={true}
               >
-                <MoneyInputGroup
-                  value={value}
-                  prefix={'$'}
-                  inputGroupProps={{
-                    medium: true,
-                    ...field,
-                  }}
-                  disabled={!form.values.sellable}
-                  onChange={field.onChange}
-                />
+                <ControlGroup>
+                  <InputPrependText text={baseCurrency} />
+                  <MoneyInputGroup
+                    value={value}
+                    prefix={'$'}
+                    inputGroupProps={{ fill: true }}
+                    disabled={!form.values.sellable}
+                    onChange={(evt, value) => {
+                      form.setFieldValue('sell_price', value);
+                    }}
+                  />
+                </ControlGroup>
               </FormGroup>
             )}
-          </FastField>
+          </Field>
 
-           {/*------------- Selling account ------------- */}
+          {/*------------- Selling account ------------- */}
           <FastField name={'sell_account_id'}>
             {({ form, field: { value }, meta: { error, touched } }) => (
               <FormGroup
@@ -102,8 +101,8 @@ function ItemFormBody({ accountsList }) {
 
         <Col xs={6}>
           {/*------------- Sellable checkbox ------------- */}
-          <FastField name={'purchasable'}>
-            {({ form, field: { value, onChange }, meta: { error, touched } }) => (
+          <FastField name={'purchasable'} type={'checkbox'}>
+            {({ field }) => (
               <FormGroup inline={true} className={'form-group--purchasable'}>
                 <Checkbox
                   inline={true}
@@ -112,15 +111,14 @@ function ItemFormBody({ accountsList }) {
                       <T id={'i_purchase_this_item'} />
                     </h3>
                   }
-                  checked={value}
-                  onChange={onChange}
+                  {...field}
                 />
               </FormGroup>
             )}
           </FastField>
 
           {/*------------- Cost price ------------- */}
-          <FastField name={'cost_price'}>
+          <Field name={'cost_price'}>
             {({ field, form, field: { value }, meta: { error, touched } }) => (
               <FormGroup
                 label={<T id={'cost_price'} />}
@@ -129,18 +127,21 @@ function ItemFormBody({ accountsList }) {
                 helperText={<ErrorMessage name="cost_price" />}
                 inline={true}
               >
-                <MoneyInputGroup
-                  value={value}
-                  prefix={'$'}
-                  inputGroupProps={{
-                    medium: true,
-                    ...field,
-                  }}
-                  disabled={!form.values.purchasable}
-                />
+                <ControlGroup>
+                  <InputPrependText text={baseCurrency} />
+                  <MoneyInputGroup
+                    value={value}
+                    prefix={'$'}
+                    inputGroupProps={{ medium: true }}
+                    disabled={!form.values.purchasable}
+                    onChange={(evt, unformattedValue) => {
+                      form.setFieldValue('cost_price', unformattedValue);
+                    }}
+                  />
+                </ControlGroup>
               </FormGroup>
             )}
-          </FastField>
+          </Field>
 
           {/*------------- Cost account ------------- */}
           <FastField name={'cost_account_id'}>
@@ -180,4 +181,7 @@ export default compose(
   withAccounts(({ accountsList }) => ({
     accountsList,
   })),
+  withSettings(({ organization }) => ({
+    baseCurrency: 'USD',
+  })),
 )(ItemFormBody);
diff --git a/client/src/containers/Sales/Invoice/InvoiceFormHeader.js b/client/src/containers/Sales/Invoice/InvoiceFormHeader.js
index f0d90a48b..3684d5f15 100644
--- a/client/src/containers/Sales/Invoice/InvoiceFormHeader.js
+++ b/client/src/containers/Sales/Invoice/InvoiceFormHeader.js
@@ -8,7 +8,6 @@ import {
 import { DateInput } from '@blueprintjs/datetime';
 import { FastField, ErrorMessage } from 'formik';
 import { FormattedMessage as T } from 'react-intl';
-import moment from 'moment';
 import { momentFormatter, compose, tansformDateValue, saveInvoke } from 'utils';
 import classNames from 'classnames';
 import { CLASSES } from 'common/classes';
diff --git a/client/src/style/objects/form.scss b/client/src/style/objects/form.scss
index 53d3f7a50..2d154cbcd 100644
--- a/client/src/style/objects/form.scss
+++ b/client/src/style/objects/form.scss
@@ -98,6 +98,45 @@ label.bp3-label{
   }
 }
 
+.input-group-prepend{
+
+  .input-group-text{
+    display: flex;
+    align-items: center;
+    padding: .375rem .75rem;
+    margin-bottom: 0;
+    font-size: 1rem;
+    font-weight: 400;
+    line-height: 1.5;
+    color: #495057;
+    text-align: center;
+    white-space: nowrap;
+    background-color: #e9ecef;
+    border: 1px solid #ced4da;
+    border-radius: .25rem;
+    height: 100%;
+
+    .bp3-form-group &{
+      padding: .25rem .5rem;
+      font-size: .875rem;
+      line-height: 1.5;
+      border-radius: .2rem;
+    }
+  }
+}
+
+.bp3-form-group{
+
+  .bp3-input-group{
+    flex: 1 1 auto;
+  }
+  .bp3-control-group{
+    > .input-group-prepend:first-child .input-group-text{
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
+    }
+  } 
+}
 
 .#{$ns}-html-select{
   .bp3-icon-double-caret-vertical{