   render: ->
     <div className="content-container">
       <p>Collaborators</p>
-
+      <hr />
       {if @state.error?
         <p className="form-help error">{@state.error.toString()}</p>}
-
       <PromiseRenderer promise={@props.project.get 'project_roles'} then={(projectRoleSets) =>
-        <div className="fake-table standard-table">
+        <div>
           {for projectRoleSet in projectRoleSets
-            <PromiseRenderer promise={projectRoleSet.get 'owner'} then={@renderUserRow.bind this, projectRoleSet} />}
-          {@renderAddUserRow()}
+            <PromiseRenderer key={projectRoleSet.id} promise={projectRoleSet.get 'owner'} then={@renderUserRow.bind this, projectRoleSet} />}
         </div>
       } />
+      <hr />
+      <p>Add another</p>
+      <CollaboratorCreator project={@props.project} onAdd={@handleCollaboratorAddition} />
     </div>
 
   renderUserRow: (projectRoleSet, user) ->
-    <div className="fake-tr">
-      <div className="fake-td">
-        {user.display_name}
-      </div>
+    <p>
+      <strong>{user.display_name}</strong>{' '}
+      <button type="button" className="secret-button" onClick={@removeRoleSet.bind this, projectRoleSet}>&times;</button>
+      <br />
 
-      {for role in POSSIBLE_ROLES
-        toggleThisRole = @toggleRole.bind this, projectRoleSet, role
-        # TODO: Translate this.
-        <label className="fake-td">
-          <input type="checkbox" name={role} checked={role in projectRoleSet.roles} disabled={projectRoleSet.id in @state.saving} onChange={toggleThisRole} />{' '}
-          {role[...1].toUpperCase()}{role[1...]}
-        </label>}
-
-      <div className="fake-td">
-        <button type="button" onClick={@removeRoleSet.bind this, projectRoleSet}>&times;</button>
-      </div>
-    </div>
+      <span className="columns-container inline">
+        {for role in POSSIBLE_ROLES
+          toggleThisRole = @toggleRole.bind this, projectRoleSet, role
+          # TODO: Translate this.
+          <label key={role}>
+            <input type="checkbox" name={role} checked={role in projectRoleSet.roles} disabled={projectRoleSet.id in @state.saving} onChange={toggleThisRole} />{' '}
+            {role[...1].toUpperCase()}{role[1...]}
+          </label>}
+      </span>
+    </p>
 
   toggleRole: (projectRoleSet, role) ->
     index = projectRoleSet.roles.indexOf role

  'tester'
  'translator'
]

module.exports = React.createClass
  displayName: 'EditProjectCollaborators'

        @state.saving.splice savingIndex, 1
        @setState saving: @state.saving

  handleCollaboratorAddition: ->
    @project.uncacheLink 'project_roles'
    @forceUpdate()
