             <Tip title="Enter student's grade" tip="Enter the grade that you assigned to your student on this assignment here.  You can enter anything (it doesn't have to be a number).">
                 <Button key='edit' onClick={@edit_grade} bsStyle={bsStyle}>Enter grade</Button>
             </Tip>
-            {@render_grade_score()}
+            {@render_grade_and_comment()}
         </Col>
 
     render_last_time: (name, time) ->

    save_grade: (e) ->
        e?.preventDefault()
        @actions(@props.name).set_grade(@props.assignment, @props.student, @state.edited_grade)
        @setState(editing_grade:false)

    edit_grade: ->
        @setState(edited_grade:@props.grade ? '', editing_grade:true)

    render_grade_score: ->
        if @state.editing_grade
            <form key='grade' onSubmit={@save_grade} style={marginTop:'15px'}>
                <FormGroup>
                    <InputGroup>
                        <FormControl
                            autoFocus
                            value       = {@state.edited_grade}
                            ref         = 'grade_input'
                            type        = 'text'
                            placeholder = 'Grade (any text)...'
                            onChange    = {=>@setState(edited_grade:ReactDOM.findDOMNode(@refs.grade_input).value ? '')}
                            onBlur      = {@save_grade}
                            onKeyDown   = {(e)=>if e.keyCode == 27 then @setState(edited_grade:@props.grade, editing_grade:false)}
                        />
                        <InputGroup.Button>
                            <Button bsStyle='success'>Save</Button>
                        </InputGroup.Button>
                    </InputGroup>
                </FormGroup>
            </form>
        else
            if @props.grade
                <div key='grade' onClick={@edit_grade}>
                    Grade: {@props.grade}
                </div>

    render_grade: (width) ->
        bsStyle = if not (@props.grade ? '').trim() then 'primary'

        student    : rtypes.oneOfType([rtypes.string,rtypes.object]).isRequired # required string (student_id) or student immutable js object
        assignment : rtypes.oneOfType([rtypes.string,rtypes.object]).isRequired # required string (assignment_id) or assignment immutable js object
        grade      : rtypes.string
        comment    : rtypes.string
        info       : rtypes.object.isRequired

    getInitialState: ->
        editing_grade  : false
        edited_grade   : ''
        edited_comment : ''

    open: (type, assignment_id, student_id) ->
        @actions(@props.name).open_assignment(type, assignment_id, student_id)
