     fromNameDescription = "The name to use for sending emails"
 
     <Well>
-      <BooleanEntry name="Send Emails" value={@state.enable_email} onChange=@toggleEnabled description={emailDescription}/>
-      <TextEntry name="SMTP URL" value={@state.smtp_url} type="text" onChange=@updateSMTPUrl description={SMTPDescription} />
-      <TextEntry name="Email Username" value={@state.email_username} type="text" onChange=@updateUsername description={usernameDescription}/>
-      <TextEntry name="Email Password" value={@state.email_password} type="password" onChange=@updatePassword description={passwordDescription}/>
-      <TextEntry name="From Address" value={@state.from_addr} type="text" onChange=@updateFromAddr description={fromAddressDescription}/>
-      <TextEntry name="From Name" value={@state.from_name} type="text" onChange=@updateFromName description={fromNameDescription}/>
       <Row>
-        <div className="text-center">
-          <ButtonToolbar>
-            <Button onClick={@pushUpdates}>Update</Button>
-          </ButtonToolbar>
-        </div>
+        <Col xs={6}>
+          <BooleanEntry name="Send Emails" value={@state.enable_email} onChange=@toggleEnabled description={emailDescription}/>
+          <TextEntry name="SMTP URL" value={@state.smtp_url} type="text" onChange=@updateSMTPUrl description={SMTPDescription} />
+          <TextEntry name="Email Username" value={@state.email_username} type="text" onChange=@updateUsername description={usernameDescription}/>
+          <TextEntry name="Email Password" value={@state.email_password} type="password" onChange=@updatePassword description={passwordDescription}/>
+          <TextEntry name="From Address" value={@state.from_addr} type="text" onChange=@updateFromAddr description={fromAddressDescription}/>
+          <TextEntry name="From Name" value={@state.from_name} type="text" onChange=@updateFromName description={fromNameDescription}/>
+          <Row>
+            <div className="text-center">
+              <ButtonToolbar>
+                <Button onClick={@pushUpdates}>Update</Button>
+              </ButtonToolbar>
+            </div>
+          </Row>
+        </Col>
+        <Col xs={6}>
+          <EmailWhitelist pushUpdates={@pushUpdates} emails={@props.emailFilterSettings}/>
+        </Col>
       </Row>
     </Well>
 

        from_name: @state.from_name
      logging:
        admin_emails: @state.admin_emails

    apiCall "POST", "/api/admin/settings/change", {json: JSON.stringify(pushData)}
    .done ((data) ->

        from_name: ""
      logging:
        admin_emails: []
      email_filter: []

    tabKey: "general"

