         style             : rtypes.object
 
     render : ->
-        if not @props.show_confirmation
-            <Button
-                disabled={@props.show_confirmation}
-                className='pull-right'
-                bsStyle='danger'
-                style={@props.style}
-                onClick=@props.initial_click>
-            <Icon name='trash' /> Delete Account
-            </Button>
-        else
-            <DeleteAccountConfirmation
+        <div>
+            <div style={height:'26px'}>
+                <Button
+                    disabled={@props.show_confirmation}
+                    className='pull-right'
+                    bsStyle='danger'
+                    style={@props.style}
+                    onClick=@props.initial_click>
+                <Icon name='trash' /> Delete Account...
+                </Button>
+            </div>
+            {<DeleteAccountConfirmation
                 confirm_click={@props.confirm_click}
-                cancel_click={@props.cancel_click}/>
+                cancel_click={@props.cancel_click}
+             /> if @props.show_confirmation}
+        </div>
 
 # Concious choice to make them actually click the confirm delete button.
 DeleteAccountConfirmation = rclass

        if @is_submittable()
            <Button onClick={@save_new_password} bsStyle='success'>
                Change password
            </Button>
        else
            <Button disabled bsStyle='success'>Change password</Button>


    getInitialState : ->
        state      : 'view'   # view --> edit --> saving --> view or edit
        password   : ''
        email_address : ''    # The new email address

    start_editing : ->
        @setState
