                 <Button onClick={@save_student_name} bsStyle='success' disabled={disable_save}>
                     <Icon name='save'/> Save
                 </Button>
-                <Button onClick={=>@setState(@getInitialState())} >
+                <Button onClick={@cancel_student_edit} >
                     Cancel
                 </Button>
             </ButtonGroup>

            <Button onClick={@show_edit_name_dialogue}>
                <Icon name='address-card-o'/> Edit student...
            </Button>

    save_student_name: ->
        @actions(@props.name).set_internal_student_name(@props.student, @state.edited_first_name, @state.edited_last_name)

            return <FormGroup style={marginBottom:'0px'}>
                <FormControl
                    type       = 'text'
                    autoFocus  = {true}
                    style      = {display:'inline-block', width:'50%'}
                    value      = {@state.edited_first_name}
                    onClick    = {(e) => e.stopPropagation(); e.preventDefault()}
