diff --git a/x-pack/plugins/spaces/public/views/management/_manage_spaces.scss b/x-pack/plugins/spaces/public/views/management/_manage_spaces.scss
index f1bc69507446c..e75ec62a363cf 100644
--- a/x-pack/plugins/spaces/public/views/management/_manage_spaces.scss
+++ b/x-pack/plugins/spaces/public/views/management/_manage_spaces.scss
@@ -9,10 +9,3 @@
 .spcGridPage {
   min-height: calc(100vh - 70px);
 }
-
-.spcManagePage__content {
-  max-width: 1280px;
-  margin-left: auto;
-  margin-right: auto;
-  flex-grow: 0;
-}
diff --git a/x-pack/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.tsx b/x-pack/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.tsx
index 91d1713b37869..d7ab85c58a5d5 100644
--- a/x-pack/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.tsx
+++ b/x-pack/plugins/spaces/public/views/management/components/secure_space_message/secure_space_message.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiLink, EuiSpacer, EuiText } from '@elastic/eui';
+import { EuiLink, EuiText } from '@elastic/eui';
 import React, { Fragment } from 'react';
 import { UserProfile } from 'x-pack/common/user_profile';
 
@@ -16,7 +16,6 @@ export const SecureSpaceMessage = (props: Props) => {
   if (props.userProfile.hasCapability('manageSecurity')) {
     return (
       <Fragment>
-        <EuiSpacer />
         <EuiText className="eui-textCenter">
           <p>
             Want to assign a role to a space? Go to Management and select{' '}
diff --git a/x-pack/plugins/spaces/public/views/management/edit_space/customize_space/customize_space.tsx b/x-pack/plugins/spaces/public/views/management/edit_space/customize_space/customize_space.tsx
index e70f28b335135..afdbb649b75be 100644
--- a/x-pack/plugins/spaces/public/views/management/edit_space/customize_space/customize_space.tsx
+++ b/x-pack/plugins/spaces/public/views/management/edit_space/customize_space/customize_space.tsx
@@ -12,8 +12,10 @@ import {
   EuiFlexItem,
   EuiFormRow,
   EuiPanel,
+  EuiPopover,
   EuiSpacer,
   EuiText,
+  EuiTextArea,
 } from '@elastic/eui';
 import React, { ChangeEvent, Component, Fragment } from 'react';
 import { isReservedSpace } from 'x-pack/plugins/spaces/common';
@@ -39,30 +41,41 @@ export class CustomizeSpace extends Component<Props, {}> {
         <EuiDescribedFormGroup
           title={<h3>Customize your space</h3>}
           description={this.getPanelDescription()}
+          fullWidth
         >
-          <EuiFormRow label="Name" {...validator.validateSpaceName(this.props.space)} fullWidth>
-            <EuiFieldText
-              name="name"
-              placeholder={'Awesome space'}
-              value={name}
-              onChange={this.onNameChange}
-              fullWidth
-            />
-          </EuiFormRow>
+          <EuiFlexGroup responsive={false}>
+            <EuiFlexItem>
+              <EuiFormRow label="Name" {...validator.validateSpaceName(this.props.space)} fullWidth>
+                <EuiFieldText
+                  name="name"
+                  placeholder={'Awesome space'}
+                  value={name}
+                  onChange={this.onNameChange}
+                  fullWidth
+                />
+              </EuiFormRow>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiFormRow label="Avatar">
+                <EuiPopover
+                  id="customizeAvatarPopover"
+                  button={
+                    <button title="Click to customize">
+                      <SpaceAvatar space={this.props.space} size="l" />
+                    </button>
+                  }
+                  // closePopover={() => {}}
+                  // isOpen={!!name}
+                >
+                  <div style={{ maxWidth: 240 }}>
+                    <CustomizeSpaceAvatar space={this.props.space} onChange={this.onAvatarChange} />
+                  </div>
+                </EuiPopover>
+              </EuiFormRow>
+            </EuiFlexItem>
+          </EuiFlexGroup>
 
-          {name && (
-            <Fragment>
-              <EuiFlexGroup responsive={false}>
-                <EuiFlexItem grow={false}>
-                  <EuiFormRow label="Avatar">
-                    <SpaceAvatar space={this.props.space} size="l" />
-                  </EuiFormRow>
-                </EuiFlexItem>
-                <CustomizeSpaceAvatar space={this.props.space} onChange={this.onAvatarChange} />
-              </EuiFlexGroup>
-              <EuiSpacer />
-            </Fragment>
-          )}
+          <EuiSpacer />
 
           {this.props.space && isReservedSpace(this.props.space) ? null : (
             <Fragment>
@@ -77,15 +90,16 @@ export class CustomizeSpace extends Component<Props, {}> {
 
           <EuiFormRow
             label="Description (optional)"
+            helpText="Displayed alongside the space avatar on the space selection screen"
             {...validator.validateSpaceDescription(this.props.space)}
             fullWidth
           >
-            <EuiFieldText
+            <EuiTextArea
               name="description"
-              placeholder={'This is where the magic happens'}
               value={description}
               onChange={this.onDescriptionChange}
               fullWidth
+              rows={2}
             />
           </EuiFormRow>
         </EuiDescribedFormGroup>
@@ -126,7 +140,7 @@ export class CustomizeSpace extends Component<Props, {}> {
     });
   };
 
-  public onDescriptionChange = (e: ChangeEvent<HTMLInputElement>) => {
+  public onDescriptionChange = (e: ChangeEvent<HTMLTextAreaElement>) => {
     this.props.onChange({
       ...this.props.space,
       description: e.target.value,
diff --git a/x-pack/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.tsx b/x-pack/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.tsx
index 4ad9b9e71c1c8..c0f8489d5a625 100644
--- a/x-pack/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.tsx
+++ b/x-pack/plugins/spaces/public/views/management/edit_space/customize_space/customize_space_avatar.tsx
@@ -37,23 +37,24 @@ export class CustomizeSpaceAvatar extends Component<Props, State> {
 
     return (
       <Fragment>
-        <EuiFlexItem grow={false}>
-          <EuiFormRow label={'Initials (2 max)'}>
-            <EuiFieldText
-              inputRef={this.initialsInputRef}
-              name="spaceInitials"
-              // allows input to be cleared or otherwise invalidated while user is editing the initials,
-              // without defaulting to the derived initials provided by `getSpaceInitials`
-              value={initialsHasFocus ? pendingInitials || '' : getSpaceInitials(space)}
-              onChange={this.onInitialsChange}
-            />
-          </EuiFormRow>
-        </EuiFlexItem>
-        <EuiFlexItem grow={true}>
-          <EuiFormRow label={'Color'}>
-            <EuiColorPicker color={getSpaceColor(space)} onChange={this.onColorChange} />
-          </EuiFormRow>
-        </EuiFlexItem>
+        <EuiFormRow label={'Initials (2 max)'}>
+          <EuiFieldText
+            inputRef={this.initialsInputRef}
+            name="spaceInitials"
+            // allows input to be cleared or otherwise invalidated while user is editing the initials,
+            // without defaulting to the derived initials provided by `getSpaceInitials`
+            value={initialsHasFocus ? pendingInitials || '' : getSpaceInitials(space)}
+            onChange={this.onInitialsChange}
+            disabled={!space.name}
+          />
+        </EuiFormRow>
+        <EuiFormRow label={'Color'}>
+          <EuiColorPicker
+            disabled={!space.name}
+            color={getSpaceColor(space)}
+            onChange={this.onColorChange}
+          />
+        </EuiFormRow>
       </Fragment>
     );
   }
diff --git a/x-pack/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.tsx b/x-pack/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.tsx
index a8fcd313d4577..191884579640b 100644
--- a/x-pack/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.tsx
+++ b/x-pack/plugins/spaces/public/views/management/edit_space/customize_space/space_identifier.tsx
@@ -44,7 +44,7 @@ export class SpaceIdentifier extends Component<Props, State> {
       <Fragment>
         <EuiFormRow
           label={this.getLabel()}
-          helpText={this.getHelpText()}
+          helpText={this.getHelpText(id)}
           {...this.props.validator.validateURLIdentifier(this.props.space)}
           fullWidth
         >
@@ -53,7 +53,7 @@ export class SpaceIdentifier extends Component<Props, State> {
             placeholder={
               this.state.editing || !this.props.editable
                 ? undefined
-                : 'The URL identifier is generated from the space name.'
+                : 'awesome-space'
             }
             value={id}
             onChange={this.onChange}
@@ -74,8 +74,8 @@ export class SpaceIdentifier extends Component<Props, State> {
     return (<p>URL identifier <EuiLink onClick={this.onEditClick}>{editLinkText}</EuiLink></p>);
   };
 
-  public getHelpText = () => {
-    return (<p>If the identifier is <strong>engineering</strong>, the Kibana URL is <br /> https://my-kibana.example<strong>/s/engineering/</strong>app/kibana.</p>);
+  public getHelpText = (identifier: string) => {
+    return (<p>Example: https://my-kibana.example<strong>/s/{identifier || 'awesome-space'}/</strong>app/kibana</p>);
   };
 
   public onEditClick = () => {
diff --git a/x-pack/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.tsx b/x-pack/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.tsx
index 64d695be42222..8c268bf31346a 100644
--- a/x-pack/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.tsx
+++ b/x-pack/plugins/spaces/public/views/management/edit_space/enabled_features/enabled_features.tsx
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 // @ts-ignore
-import { EuiDescribedFormGroup, EuiFormRow, EuiIconTip, EuiText } from '@elastic/eui';
-import React, { Component, ReactNode } from 'react';
+import { EuiCallOut, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
+import React, { Component, Fragment, ReactNode } from 'react';
 import { Feature } from 'x-pack/common/feature';
 import { Space } from 'x-pack/plugins/spaces/common/model/space';
 import { CollapsiblePanel } from 'x-pack/public/components';
@@ -21,18 +21,22 @@ export class EnabledFeatures extends Component<Props, {}> {
   public render() {
     return (
       <CollapsiblePanel initiallyCollapsed title={this.getPanelTitle()}>
-        <EuiDescribedFormGroup
-          title={<h3>Enable features within this space</h3>}
-          description={this.getDescription()}
-        >
-          <EuiFormRow hasEmptyLabelSpace>
+        <EuiFlexGroup>
+          <EuiFlexItem>
+            <EuiTitle size="xs">
+              <h3>Enable features within this space</h3>
+            </EuiTitle>
+            <EuiSpacer size="s" />
+            {this.getDescription()}
+          </EuiFlexItem>
+          <EuiFlexItem>
             <FeatureTable
               features={this.props.features}
               space={this.props.space}
               onChange={this.props.onChange}
             />
-          </EuiFormRow>
-        </EuiDescribedFormGroup>
+          </EuiFlexItem>
+        </EuiFlexGroup>
       </CollapsiblePanel>
     );
   }
@@ -53,15 +57,8 @@ export class EnabledFeatures extends Component<Props, {}> {
       );
     } else if (enabledCount === 0) {
       details = (
-        <EuiText color={'danger'} size={'s'} style={{ display: 'inline-block' }}>
-          <em>
-            <EuiIconTip
-              type={'alert'}
-              color={'danger'}
-              content={`At least one feature must be enabled`}
-            />{' '}
-            (no features enabled)
-          </em>
+        <EuiText color="danger" size={'s'} style={{ display: 'inline-block' }}>
+          <em>(no features enabled)</em>
         </EuiText>
       );
     } else {
@@ -84,13 +81,30 @@ export class EnabledFeatures extends Component<Props, {}> {
   };
 
   private getDescription = () => {
+    const featureCount = this.props.features.length;
+    const disabledCount = this.getKnownDisabledFeatures().length;
+    const enabledCount = featureCount - disabledCount;
+
     return (
-      <EuiText>
-        <p>Choose which features are enabled within this space.</p>
-        <p>
-          <strong>Note: </strong> this is not a security mechanism.
-        </p>
-      </EuiText>
+      <Fragment>
+        <EuiText size="s" color="subdued">
+          <p>Choose which features are enabled within this space.</p>
+          <p>
+            <strong>Note: </strong> this is not a security mechanism.
+          </p>
+        </EuiText>
+        {enabledCount === 0 && (
+          <Fragment>
+            <EuiSpacer />
+            <EuiCallOut
+              color="danger"
+              title="At least one feature must be enabled"
+              iconType="alert"
+              size="s"
+            />
+          </Fragment>
+        )}
+      </Fragment>
     );
   };
 }
diff --git a/x-pack/plugins/spaces/public/views/management/edit_space/enabled_features/feature_table.tsx b/x-pack/plugins/spaces/public/views/management/edit_space/enabled_features/feature_table.tsx
index 029ee8487501e..ff8eba1641453 100644
--- a/x-pack/plugins/spaces/public/views/management/edit_space/enabled_features/feature_table.tsx
+++ b/x-pack/plugins/spaces/public/views/management/edit_space/enabled_features/feature_table.tsx
@@ -53,14 +53,16 @@ export class FeatureTable extends Component<Props, {}> {
       render: (feature: Feature) => {
         return (
           <EuiText>
-            <EuiIcon type={feature.icon as IconType} style={{ marginRight: '10px' }} />
-            {feature.name}
+            <EuiIcon type={feature.icon as IconType} />
+            &ensp; {feature.name}
           </EuiText>
         );
       },
     },
     {
       field: 'space',
+      width: '80',
+      align: 'right',
       name: 'Enabled?',
       render: (spaceEntry: Space, record: Record<string, any>) => {
         const checked = !(
diff --git a/x-pack/plugins/spaces/public/views/management/edit_space/manage_space_page.tsx b/x-pack/plugins/spaces/public/views/management/edit_space/manage_space_page.tsx
index a265bf383ed21..fc7e23b77182d 100644
--- a/x-pack/plugins/spaces/public/views/management/edit_space/manage_space_page.tsx
+++ b/x-pack/plugins/spaces/public/views/management/edit_space/manage_space_page.tsx
@@ -154,7 +154,7 @@ export class ManageSpacePage extends Component<Props, State> {
           onChange={this.onSpaceChange}
         />
 
-        <EuiHorizontalRule />
+        <EuiSpacer />
 
         {this.getFormButtons()}
       </Fragment>
@@ -180,7 +180,12 @@ export class ManageSpacePage extends Component<Props, State> {
 
   public maybeGetSecureSpacesMessage = () => {
     if (this.editingExistingSpace()) {
-      return <SecureSpaceMessage userProfile={this.props.userProfile} />;
+      return (
+        <Fragment>
+          <EuiHorizontalRule />
+          <SecureSpaceMessage userProfile={this.props.userProfile} />
+        </Fragment>
+      );
     }
     return null;
   };