--- a/.editorconfig	Wed Jun 14 15:29:01 2017 +0200
+++ b/.editorconfig	Wed Jun 14 16:06:40 2017 +0200
@@ -8,6 +8,6 @@
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.js]
+[*.js,*.css]
 indent_style = space
 indent_size = 2

--- a/client/src/App.scss	Wed Jun 14 15:29:01 2017 +0200
+++ b/client/src/App.scss	Wed Jun 14 16:06:40 2017 +0200
@@ -4,6 +4,11 @@
   text-align: center;
 }
 
+#root {
+  height: 100%;
+  padding-bottom: 270px;
+}
+
 .App-logo {
   animation: App-logo-spin infinite 20s linear;
   height: 80px;
@@ -117,3 +122,13 @@
     text-decoration-style: dotted;
 
 }
+
+.editor-fixed {
+    border-top: 1px solid #efefef;
+    background-color: #fff;
+    padding: 20px 0;
+    position: fixed;
+    height: 270px;
+    bottom: 0;
+    width: 100%;
+}

--- a/client/src/components/Note.js	Wed Jun 14 15:29:01 2017 +0200
+++ b/client/src/components/Note.js	Wed Jun 14 16:06:40 2017 +0200
@@ -3,7 +3,7 @@
 
 const Note = ({note}) => {
   return (
-    <div id={"note-" + note.id} className="note">
+    <div id={"note-" + note._id} className="note">
       <span className="start">{note.startedAt}</span>
       <span className="finish">{note.finishedAt}</span>
       <div dangerouslySetInnerHTML={{ __html: note.html }} />

--- a/client/src/components/Session.js	Wed Jun 14 15:29:01 2017 +0200
+++ b/client/src/components/Session.js	Wed Jun 14 16:06:40 2017 +0200
@@ -75,11 +75,18 @@
             </Col>
             <Col md={9}>
               <NotesList notes={this.props.notes} />
-              <hr />
-              <NoteInput session={this.props.currentSession} addNote={this.props.notesActions.addNote} />
             </Col>
           </Row>
         </Grid>
+        <section className="editor-fixed">
+          <Grid fluid>
+            <Row>
+              <Col md={9} mdOffset={3}>
+                <NoteInput session={this.props.currentSession} addNote={this.props.notesActions.addNote} />
+              </Col>
+            </Row>
+          </Grid>
+        </section>
       </div>
     );
   }