         </Row>
 
     render_add_payment_method_button: ->
-        if @state.adding_payment_method
-            return
-        <Button onClick={@add_payment_method} bsStyle='primary' style={float: "right"}>
+        <Button disabled={@state.state != 'view'} onClick={@add_payment_method} bsStyle='primary' style={float: "right"}>
             <Icon name="plus-circle" /> Add Payment Method...
         </Button>
 

        that = @
        <span>
            <input className="form-control" style={display:'inline', width:'5em'} placeholder="MM" type="text" size="2"
                   onChange={(e)=>@set_input_info("month", undefined, e.target.value)}
            />
            <span> / </span>
            <input className="form-control" style={display:'inline', width:'5em'} placeholder="YY" type="text" size="2"
                   onChange={(e)=>@set_input_info("year", undefined, e.target.value)}
            />
        </span>



    render_payment_methods: ->

    render_error: ->
        if @state.error
            <ErrorDisplay error={@state.error} onClose={=>@setState(error:'')} />

    render: ->
        <Panel header={@render_header()}>
            {@render_error()}
            {@render_add_payment_method() if @state.state in ['add_new', 'submit']}
            {@render_payment_methods()}
        </Panel>

