 
         student_project_id = @props.student.get('project_id')
         if student_project_id?
-            <Tip placement='right'
-                 title='Student project'
-                 tip='Open the course project for this student.'>
-                <Button onClick={@open_project}>
-                    <Icon name="edit" /> Open student project
-                </Button>
-            </Tip>
+            <ButtonToolbar>
+                <ButtonGroup>
+                    <Button onClick={@open_project}>
+                        <Tip placement='right'
+                             title='Student project'
+                             tip='Open the course project for this student.'
+                        >
+                            <Icon name="edit" /> Open student project
+                        </Tip>
+                    </Button>
+                </ButtonGroup>
+                {@render_edit_name()}
+            </ButtonToolbar>
         else
             <Tip placement='right'
                  title='Create the student project'


    render_edit_name: ->
        if @state.editing_student
            <div>
                <Button onClick={@save_student_name} bsStyle='success'>
                    <Icon name='save'/> Save
                </Button>
                <Button onClick={=>@setState(@getInitialState())} >
                    Cancel
                </Button>
            </div>
        else
            <Button onClick={@show_edit_name_dialogue}>
                <Icon name='address-card-o'/> Edit student...


    render_panel_header: ->
        <Row>
            <Col md=8>
                {@render_project_access()}
            </Col>
            <Col md=4>
                {@render_delete_button()}
