diff -r a8300ef1876e -r 284e866f55c7 client/src/components/NoteInput.js
--- a/client/src/components/NoteInput.js	Wed Jun 07 18:18:44 2017 +0200
+++ b/client/src/components/NoteInput.js	Thu Jun 08 11:13:41 2017 +0200
@@ -4,12 +4,12 @@
 
 import PropTypes from 'prop-types';
 import SlateEditor from './SlateEditor';
+import Clock from './Clock'
 
 class NoteInput extends Component {
 
   state = {
     buttonDisabled: false,
-    time: moment().format('H:mm:ss'),
     startedAt: null,
     finishedAt: null,
   }
@@ -43,10 +43,6 @@
   componentDidMount() {
     const text = this.refs.editor.asPlain();
     this.setState({ buttonDisabled: text.length === 0 });
-    setInterval(() => {
-      const time = moment().format('H:mm:ss');
-      this.setState({ time });
-    }, 1000);
   }
 
   renderTiming() {
@@ -71,7 +67,7 @@
             { this.renderTiming() }
           </Col>
           <Col md={6} className="text-right">
-            <Label bsStyle="info">{ this.state.time }</Label>
+            <Clock />
           </Col>
         </Row>
         <hr />