diff --git a/src/common/DateInput.js b/src/common/DateInput.js
index 34c8afb1..148301e6 100644
--- a/src/common/DateInput.js
+++ b/src/common/DateInput.js
@@ -15,7 +15,7 @@ export default class DateInput extends React.Component {
       <div className="date-input-container">
         <DatePicker
           {...this.props}
-          className="date-input-container__input form-control"
+          className={`date-input-container__input form-control ${this.props.className || ''}`}
           dateFormat="YYYY-MM-DD"
           readOnly
           ref={this.inputRef}
diff --git a/src/servers/DeleteServerButton.js b/src/servers/DeleteServerButton.js
index 982dff82..67b5e219 100644
--- a/src/servers/DeleteServerButton.js
+++ b/src/servers/DeleteServerButton.js
@@ -14,6 +14,7 @@ export default class DeleteServerButton extends React.Component {
         <span
           className={this.props.className}
           onClick={() => this.setState({ isModalOpen: true })}
+          key="deleteServerBtn"
         >
           <FontAwesomeIcon icon={deleteIcon} />
           <span className="aside-menu__item-text">Delete this server</span>
@@ -25,6 +26,7 @@ export default class DeleteServerButton extends React.Component {
           toggle={() => this.setState({ isModalOpen: !this.state.isModalOpen })}
           history={history}
           server={server}
+          key="deleteServerModal"
         />
       )
     ];
diff --git a/src/short-urls/ShortUrlVisits.js b/src/short-urls/ShortUrlVisits.js
index 6508709e..c5889e58 100644
--- a/src/short-urls/ShortUrlVisits.js
+++ b/src/short-urls/ShortUrlVisits.js
@@ -1,20 +1,37 @@
+import preloader from '@fortawesome/fontawesome-free-solid/faCircleNotch';
+import FontAwesomeIcon from '@fortawesome/react-fontawesome';
+import { isEmpty, mapObjIndexed, pick } from 'ramda';
 import React from 'react';
 import { Doughnut, HorizontalBar } from 'react-chartjs-2';
 import Moment from 'react-moment';
 import { connect } from 'react-redux';
-import { pick } from 'ramda';
 import { Card, CardBody, CardHeader, UncontrolledTooltip } from 'reactstrap';
-import { getShortUrlVisits } from './reducers/shortUrlVisits';
+import DateInput from '../common/DateInput';
 import VisitsParser from '../visits/services/VisitsParser';
-import preloader from '@fortawesome/fontawesome-free-solid/faCircleNotch';
-import FontAwesomeIcon from '@fortawesome/react-fontawesome';
+import { getShortUrlVisits } from './reducers/shortUrlVisits';
+import './ShortUrlVisits.scss';
+
+const MutedMessage = ({ children }) =>
+  <div className="col-md-10 offset-md-1">
+    <Card className="bg-light mt-4" body>
+      <h3 className="text-center text-muted mb-0">
+        {children}
+      </h3>
+    </Card>
+  </div>;
 
 export class ShortUrlsVisits extends React.Component {
-  state = { startDate: '', endDate: '' };
+  state = { startDate: undefined, endDate: undefined };
+  loadVisits = (dates = {}) => {
+    const { match: { params } } = this.props;
+    this.props.getShortUrlVisits(params.shortCode, mapObjIndexed(
+      value => value && value.format ? value.format('YYYY-MM-DD') : value,
+      { ...this.state, ...dates }
+    ))
+  };
 
   componentDidMount() {
-    const { match: { params } } = this.props;
-    this.props.getShortUrlVisits(params.shortCode, this.state);
+    this.loadVisits();
   }
 
   render() {
@@ -24,15 +41,6 @@ export class ShortUrlsVisits extends React.Component {
       visitsParser,
       shortUrlVisits: { visits, loading, error, shortUrl }
     } = this.props;
-    const colors = [
-      '#97BBCD',
-      '#DCDCDC',
-      '#F7464A',
-      '#46BFBD',
-      '#FDB45C',
-      '#949FB1',
-      '#4D5360'
-    ];
     const serverUrl = selectedServer ? selectedServer.url : '';
     const shortLink = `${serverUrl}/${params.shortCode}`;
     const generateGraphData = (stats, label, isBarChart) => ({
@@ -41,7 +49,15 @@ export class ShortUrlsVisits extends React.Component {
         {
           label,
           data: Object.values(stats),
-          backgroundColor: isBarChart ? 'rgba(70, 150, 229, 0.4)' : colors,
+          backgroundColor: isBarChart ? 'rgba(70, 150, 229, 0.4)' : [
+            '#97BBCD',
+            '#DCDCDC',
+            '#F7464A',
+            '#46BFBD',
+            '#FDB45C',
+            '#949FB1',
+            '#4D5360'
+          ],
           borderColor: isBarChart ? 'rgba(70, 150, 229, 1)' : 'white',
           borderWidth: 2
         }
@@ -67,15 +83,7 @@ export class ShortUrlsVisits extends React.Component {
       </div>;
     const renderContent = () => {
       if (loading) {
-        return (
-          <div className="col-md-10 offset-md-1">
-            <Card className="bg-light mt-4" body>
-              <h3 className="text-center text-muted">
-                <FontAwesomeIcon icon={preloader} spin /> Loading...
-              </h3>
-            </Card>
-          </div>
-        );
+        return <MutedMessage><FontAwesomeIcon icon={preloader} spin /> Loading...</MutedMessage>;
       }
 
       if (error) {
@@ -86,6 +94,10 @@ export class ShortUrlsVisits extends React.Component {
         );
       }
 
+      if (isEmpty(visits)) {
+        return <MutedMessage>There have been no visits matching current filter  :(</MutedMessage>;
+      }
+
       return (
         <div className="row">
           {renderGraphCard('Operating systems', visitsParser.processOsStats(visits), false)}
@@ -132,6 +144,31 @@ export class ShortUrlsVisits extends React.Component {
           </Card>
         </header>
 
+        <section>
+          <form onSubmit={e => e.preventDefault()} className="form-inline mt-4 float-md-right">
+            <label>Period</label>
+            <DateInput
+              selected={this.state.startDate}
+              placeholderText="Since"
+              onChange={date => {
+                this.setState({ startDate: date });
+                this.loadVisits({ startDate: date });
+              }}
+              className="short-url-visits__date-input"
+            />
+            <DateInput
+              selected={this.state.endDate}
+              placeholderText="Until"
+              onChange={date => {
+                this.setState({ endDate: date });
+                this.loadVisits({ endDate: date });
+              }}
+              className="short-url-visits__date-input"
+            />
+          </form>
+          <div className="clearfix" />
+        </section>
+
         <section>
           {renderContent()}
         </section>
@@ -144,6 +181,4 @@ ShortUrlsVisits.defaultProps = {
   visitsParser: VisitsParser
 };
 
-export default connect(pick(['selectedServer', 'shortUrlVisits']), {
-  getShortUrlVisits
-})(ShortUrlsVisits);
+export default connect(pick(['selectedServer', 'shortUrlVisits']), { getShortUrlVisits })(ShortUrlsVisits);
diff --git a/src/short-urls/ShortUrlVisits.scss b/src/short-urls/ShortUrlVisits.scss
new file mode 100644
index 00000000..4ebf855e
--- /dev/null
+++ b/src/short-urls/ShortUrlVisits.scss
@@ -0,0 +1,3 @@
+.short-url-visits__date-input {
+  margin-left: 10px;
+}