diff --git a/src/components/pages/CommentModal.js b/src/components/pages/CommentModal.js
index eeba0feeb2628c848cdb518bd7b6ad3a07c37978..52433822677561d3ff84ea073cd627be3caf955c 100644
--- a/src/components/pages/CommentModal.js
+++ b/src/components/pages/CommentModal.js
@@ -9,9 +9,9 @@ class CommentModal extends Component {
     const { notes, user } = this.props;
     return notes.map((note) => {
       return (
-        <Comment key={note.id}>
+        <Comment style={{ padding: '1em' }} stylekey={note.id}>
           <Comment.Content>
-            <Comment.Author>{note.created_by_name}</Comment.Author>
+            <Comment.Author><strong>{note.created_by_name}</strong></Comment.Author>
             <Comment.Text>
               {note.note}
             </Comment.Text>
diff --git a/src/components/pages/EventDetail.js b/src/components/pages/EventDetail.js
index fc748e5e90b481b71b1463bba924661d794e160b..4c75171b9575939b03b97bf9d23282ead8f8aba6 100644
--- a/src/components/pages/EventDetail.js
+++ b/src/components/pages/EventDetail.js
@@ -118,7 +118,7 @@ class EventDetail extends Component {
               </Table.Row>
             </Table.Header>
             <Table.Body>
-              { this.props.selectedEvent ?
+              { this.props.selectedEvent && this.props.trainees ?
                 this.renderTrainees()
                 :
                 ''
diff --git a/src/components/pages/Groups.js b/src/components/pages/Groups.js
index 27518db98c3a962f415c66f552f6a5b34dc305d8..e04bf8eb9a2d7102dd5102ffcb89356fc8f9ccf2 100644
--- a/src/components/pages/Groups.js
+++ b/src/components/pages/Groups.js
@@ -6,22 +6,6 @@ export default class Groups extends Component {
   render() {
     return (
       <div>
-        <Segment inverted textAlign='center' vertical>
-          <Container>
-            <Header
-              as='h1'
-              content='KĂśreink'
-              inverted
-              style={{
-                fontSize: '3em',
-                fontWeight: 'normal',
-                marginBottom: 0,
-                marginTop: '0.5em',
-              }}
-            />
-          </Container>
-        </Segment>
-
         <Segment style={{ padding: '8em 0em' }} vertical>
           <Container text>
             <Header as='h3' style={{ fontSize: '2em' }}>DevTeam</Header>