diff --git a/client/src/lib/bootstrap-components.js b/client/src/lib/bootstrap-components.js
index f8206e7d..88aba5d8 100644
--- a/client/src/lib/bootstrap-components.js
+++ b/client/src/lib/bootstrap-components.js
@@ -67,7 +67,6 @@ class Icon extends Component {
 @withComponentMixins([
     withErrorHandling
 ])
-
 class Button extends Component {
     static propTypes = {
         onClickAsync: PropTypes.func,
diff --git a/client/src/lists/segments/CUD.js b/client/src/lists/segments/CUD.js
index 0b7c5c93..5c007caa 100644
--- a/client/src/lists/segments/CUD.js
+++ b/client/src/lists/segments/CUD.js
@@ -355,19 +355,6 @@ export default class CUD extends Component {
                 <Title>{isEdit ? t('editSegment') : t('createSegment')}</Title>
 
                 <Form stateOwner={this} onSubmitAsync={::this.submitAndLeave}>
-                    {isEdit ?
-                        <ButtonRow format="wide" className={`col-xs-12 ${styles.toolbar}`}>
-                            <FormButton type="submit" className="btn-primary" icon="check" label={t('saveAndStay')} onClickAsync={::this.submitAndStay}/>
-                            <FormButton type="submit" className="btn-primary" icon="check" label={t('saveAndLeave')}/>
-
-                            <NavButton className="btn-danger" icon="trash-alt" label={t('delete')} linkTo={`/lists/${this.props.list.id}/segments/${this.props.entity.id}/delete`}/>
-                        </ButtonRow>
-                    :
-                        <ButtonRow format="wide" className={`col-xs-12 ${styles.toolbar}`}>
-                            <FormButton type="submit" className="btn-primary" icon="check" label={t('save')}/>
-                        </ButtonRow>
-                    }
-
                     <h3>{t('segmentOptions')}</h3>
 
                     <InputField id="name" label={t('name')} />
@@ -380,8 +367,8 @@ export default class CUD extends Component {
                     <div className={styles.leftPane}>
                         <div className={styles.leftPaneInner}>
                             <Toolbar>
-                                <Button className="btn-primary" label={t('addCompositeRule')} onClickAsync={::this.addCompositeRule}/>
-                                <Button className="btn-primary" label={t('addRule')} onClickAsync={::this.addPrimitiveRule}/>
+                                <Button className="btn-secondary" label={t('addCompositeRule')} onClickAsync={::this.addCompositeRule}/>
+                                <Button className="btn-secondary" label={t('addRule')} onClickAsync={::this.addPrimitiveRule}/>
                             </Toolbar>
 
                             <h3>{t('rules')}</h3>
@@ -418,6 +405,21 @@ export default class CUD extends Component {
                         </div>
                     </div>
                 </div>
+
+                <hr/>
+                {isEdit ?
+                    <ButtonRow format="wide" className={`col-xs-12 ${styles.toolbar}`}>
+                        <Button type="submit" className="btn-primary" icon="check" label={t('saveAndStay')} onClickAsync={::this.submitAndStay}/>
+                        <Button type="submit" className="btn-primary" icon="check" label={t('saveAndLeave')} onClickAsync={::this.submitAndLeave}/>
+
+                        <NavButton className="btn-danger" icon="trash-alt" label={t('delete')} linkTo={`/lists/${this.props.list.id}/segments/${this.props.entity.id}/delete`}/>
+                    </ButtonRow>
+                    :
+                    <ButtonRow format="wide" className={`col-xs-12 ${styles.toolbar}`}>
+                        <Button type="submit" className="btn-primary" icon="check" label={t('save')} onClickAsync={::this.submitAndLeave}/>
+                    </ButtonRow>
+                }
+
             </div>
         );
     }