diff --git a/packages/cp-frontend/src/components/manifest/manifest.js b/packages/cp-frontend/src/components/manifest/manifest.js
index 14d29c3a..ef0eabfd 100644
--- a/packages/cp-frontend/src/components/manifest/manifest.js
+++ b/packages/cp-frontend/src/components/manifest/manifest.js
@@ -1,11 +1,13 @@
 import React from 'react';
-import { FormMeta, Button, Label } from 'joyent-ui-toolkit';
+import { FormGroup, FormMeta, Button, FormLabel } from 'joyent-ui-toolkit';
 import { Row } from 'react-styled-flexboxgrid';
 import remcalc from 'remcalc';
 import { Field } from 'redux-form';
 import { MEditor } from './editors';
 
-const ButtonsRow = Row.extend`margin: ${remcalc(29)} 0 ${remcalc(60)} 0;`;
+const ButtonsRow = Row.extend`
+  margin: ${remcalc(29)} 0 ${remcalc(60)} 0;
+`;
 
 export const Manifest = ({
   handleSubmit,
@@ -15,10 +17,12 @@ export const Manifest = ({
   loading
 }) => (
   <form onSubmit={handleSubmit}>
-    <FormMeta left>
-      <Label>Project manifest</Label>
-    </FormMeta>
-    <Field name="manifest" defaultValue={defaultValue} component={MEditor} />
+    <FormGroup reduxForm>
+      <FormMeta left>
+        <FormLabel>Project manifest</FormLabel>
+      </FormMeta>
+      <Field name="manifest" defaultValue={defaultValue} component={MEditor} />
+    </FormGroup>
     <ButtonsRow>
       <Button type="button" onClick={onCancel} secondary>
         Cancel
@@ -34,4 +38,4 @@ export const Manifest = ({
   </form>
 );
 
-export default Manifest;
\ No newline at end of file
+export default Manifest;
diff --git a/packages/cp-frontend/src/components/manifest/name.js b/packages/cp-frontend/src/components/manifest/name.js
index 219dd82b..35e7168d 100644
--- a/packages/cp-frontend/src/components/manifest/name.js
+++ b/packages/cp-frontend/src/components/manifest/name.js
@@ -5,7 +5,7 @@ import remcalc from 'remcalc';
 import {
   FormMeta,
   Button,
-  Label,
+  FormLabel,
   Input,
   Small,
   FormGroup
@@ -19,7 +19,7 @@ export const Name = ({ handleSubmit, onCancel, dirty }) => (
       <Col xs={12} md={4} lg={4}>
         <FormGroup name="name" reduxForm>
           <FormMeta left>
-            <Label>Name the new deployment group</Label>
+            <FormLabel>Name the new deployment group</FormLabel>
             <Small>
               Your services will be deployed to eu-east-1 data center.
             </Small>
diff --git a/packages/ui-toolkit/src/form/label.js b/packages/ui-toolkit/src/form/label.js
index 8142d304..b121e4a8 100644
--- a/packages/ui-toolkit/src/form/label.js
+++ b/packages/ui-toolkit/src/form/label.js
@@ -5,6 +5,7 @@ import Label from '../label';
 
 const StyledLabel = Label.extend`
   margin-right: ${remcalc(12)};
+  font-weight: bold;
 `;
 
 export default props => {
diff --git a/packages/ui-toolkit/src/label/index.js b/packages/ui-toolkit/src/label/index.js
index 8089adad..2c7fae0a 100644
--- a/packages/ui-toolkit/src/label/index.js
+++ b/packages/ui-toolkit/src/label/index.js
@@ -10,7 +10,6 @@ const Label = styled.label`
   font-size: ${remcalc(15)};
   font-style: normal;
   font-stretch: normal;
-  font-weight: bold;
   display: block;
   color: ${props => props.theme.secondary};
 `;