diff --git a/.eslintrc b/.eslintrc
index 28b279b..c15015b 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,11 +1,5 @@
 {
-  "parser": "babel-eslint",
-  "extends": [
-    "airbnb"
-  ],
-  "plugins": [
-    "babel"
-  ],
+  "extends": "eslint-config-topcoder/react",
   "env": {
     "browser": true,
     "mocha": true
@@ -17,27 +11,20 @@
     "google": true,
   },
   "rules": {
-    "global-require": 0,
-    "no-script-url": 0,
+    "import/no-unresolved": [2, { ignore: ['^components/', '^containers/', '^services/', '^layouts/', '^store/', '^api/', '^routes/'] }],
+
+    // temporary for in-progress features
+    "no-alert": 0,
+
+    // disable for unit tests
+    "no-unused-expressions": 0,
+
+    // relax rules
+    "no-magic-numbers": 0,
     "max-len": 0,
-    "new-cap": 0,
-    "object-curly-spacing": ["error", "always"],
     "react/jsx-no-bind": 0,
-    "no-mixed-operators": 0,
-    "arrow-parens": [
-      2,
-      "always"
-    ],
-    "import/extensions": 0,
-    "import/no-unresolved": 0,
-    "import/no-named-as-default": 0,
-    "import/no-extraneous-dependencies": 0,
-    "no-underscore-dangle": 0,
-    "react/forbid-prop-types": 0,
-    "no-unused-expressions": 0,
-    "jsx-a11y/anchor-has-content": 0,
-    "no-plusplus": 0,
-    "jsx-a11y/no-static-element-interactions": 0,
-    "no-use-before-define": ["error", { "functions": false, "classes": true }],
+    "import/order": 0,
+    "import/imports-first": 0,
+    "no-restricted-syntax": 0,
   }
 }
diff --git a/package.json b/package.json
index dcb6b63..2ee9179 100644
--- a/package.json
+++ b/package.json
@@ -66,10 +66,7 @@
     "react-dropdown": "^1.2.0",
     "react-icheck": "^0.3.6",
     "react-input-range": "^0.9.3",
-    "react-modal": "^1.6.2",
-    "react-flexbox-grid": "^0.10.2",
     "react-highcharts": "^11.0.0",
-    "react-modal": "^1.5.2",
     "react-redux": "^4.0.0",
     "react-redux-toastr": "^4.2.2",
     "react-router": "^2.8.1",
@@ -100,15 +97,13 @@
     "yargs": "^4.0.0"
   },
   "devDependencies": {
+    "babel-eslint": "^7.1.1",
     "chai": "^3.5.0",
     "css-modules-require-hook": "^4.0.5",
     "enzyme": "^2.6.0",
-    "eslint": "^3.7.1",
-    "eslint-config-airbnb": "^12.0.0",
-    "eslint-plugin-babel": "^3.3.0",
-    "eslint-plugin-import": "^1.16.0",
-    "eslint-plugin-jsx-a11y": "^2.2.2",
-    "eslint-plugin-react": "^6.3.0",
+    "eslint-config-topcoder": "^1.8.0",
+    "eslint-plugin-babel": "^4.0.0",
+    "eslint-plugin-react": "^6.8.0",
     "jsdom": "^9.8.3",
     "mocha": "^3.2.0",
     "mocha-webpack": "^0.7.0",
diff --git a/server.js b/server.js
index 63d1583..3a194cf 100644
--- a/server.js
+++ b/server.js
@@ -1,10 +1,12 @@
+/* eslint import/no-commonjs: 0 */
+
 /**
  * Http server for serving the frontend files
  */
 
+const path = require('path');
 const express = require('express');
 const webpack = require('webpack');
-const path = require('path');
 const config = require('config');
 const webpackConfig = require('./webpack.config');
 
diff --git a/setup-test.js b/setup-test.js
index 88897f1..c13a70b 100644
--- a/setup-test.js
+++ b/setup-test.js
@@ -1,3 +1,5 @@
+/* eslint import/no-commonjs: 0 */
+
 const hook = require('css-modules-require-hook');
 const sass = require('node-sass');
 
@@ -7,7 +9,7 @@ const sass = require('node-sass');
 hook({
   extensions: ['.scss', '.css'],
   generateScopedName: '[local]___[hash:base64:5]',
-  preprocessCss: (data, file) => sass.renderSync({ file }).css,
+  preprocessCss: (data, file) => sass.renderSync({file}).css,
 });
 
 /*
@@ -20,7 +22,7 @@ const exposedProperties = ['window', 'navigator', 'document'];
 global.document = jsdom('');
 global.window = document.defaultView;
 Object.keys(document.defaultView).forEach((property) => {
-  if (typeof global[property] === 'undefined') {
+  if (!global[property]) {
     exposedProperties.push(property);
     global[property] = document.defaultView[property];
   }
diff --git a/src/components/Accordion/Accordion.jsx b/src/components/Accordion/Accordion.jsx
index 8679f6f..eba3efe 100644
--- a/src/components/Accordion/Accordion.jsx
+++ b/src/components/Accordion/Accordion.jsx
@@ -1,11 +1,11 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import uncontrollable from 'uncontrollable';
 import CSSModules from 'react-css-modules';
 import cn from 'classnames';
 import styles from './Accordion.scss';
 
-export const Accordion = ({ onToggleExpand, isExpanded, children, title }) => (
-  <div styleName={cn('accordion', { expanded: isExpanded })}>
+export const Accordion = ({onToggleExpand, isExpanded, children, title}) => (
+  <div styleName={cn('accordion', {expanded: isExpanded})}>
     <div styleName="title" onClick={() => onToggleExpand(!isExpanded)}>
       {title}
     </div>
@@ -20,6 +20,6 @@ Accordion.propTypes = {
   title: PropTypes.any,
 };
 
-export default uncontrollable(CSSModules(Accordion, styles, { allowMultiple: true }), {
+export default uncontrollable(CSSModules(Accordion, styles, {allowMultiple: true}), {
   isExpanded: 'onToggleExpand',
 });
diff --git a/src/components/Breadcrumb/Breadcrumb.jsx b/src/components/Breadcrumb/Breadcrumb.jsx
index 3093d09..d50a065 100644
--- a/src/components/Breadcrumb/Breadcrumb.jsx
+++ b/src/components/Breadcrumb/Breadcrumb.jsx
@@ -1,9 +1,9 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import { Link } from 'react-router';
+import {Link} from 'react-router';
 import styles from './Breadcrumb.scss';
 
-export const Breadcrumb = ({ items }) => (
+export const Breadcrumb = ({items}) => (
   <ul styleName="breadcrumb">
     {items.map((item, index) => (
       <li styleName="item" key={index}>
diff --git a/src/components/Button/Button.jsx b/src/components/Button/Button.jsx
index 32313c2..ddba5e8 100644
--- a/src/components/Button/Button.jsx
+++ b/src/components/Button/Button.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import _ from 'lodash';
 import cn from 'classnames';
@@ -21,4 +21,4 @@ Button.defaultProps = {
   size: 'normal',
 };
 
-export default CSSModules(Button, styles, { allowMultiple: true });
+export default CSSModules(Button, styles, {allowMultiple: true});
diff --git a/src/components/Checkbox/Checkbox.jsx b/src/components/Checkbox/Checkbox.jsx
index 2f97096..5afdcfd 100644
--- a/src/components/Checkbox/Checkbox.jsx
+++ b/src/components/Checkbox/Checkbox.jsx
@@ -1,9 +1,9 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import _ from 'lodash';
 import styles from './Checkbox.scss';
 
-const Checkbox = ({ children, className, id, ...props }) => (
+const Checkbox = ({children, className, id, ...props}) => (
   <div styleName="checkbox" className={className}>
     <input id={id} type="checkbox" {..._.pick(props, 'checked', 'onChange', 'defaultChecked')} />
     <label htmlFor={id}>
diff --git a/src/components/CountdownTimer/Countdown.jsx b/src/components/CountdownTimer/Countdown.jsx
index 86a75ab..20c672d 100644
--- a/src/components/CountdownTimer/Countdown.jsx
+++ b/src/components/CountdownTimer/Countdown.jsx
@@ -1,4 +1,4 @@
-import React, { Component, PropTypes} from 'react';
+import React, {Component, PropTypes} from 'react';
 import DateBetween from './DateBetween';
 
 /**
@@ -9,7 +9,7 @@ export default class Countdown extends Component {
 
   constructor(props) {
     super(props);
-    this.state = { remaining: null };
+    this.state = {remaining: null};
   }
 
   componentDidMount() {
@@ -25,7 +25,7 @@ export default class Countdown extends Component {
     const startDate = new Date();
     const endDate = new Date(this.props.options.endDate);
     const remaining = DateBetween(startDate, endDate);
-    this.setState({remaining });
+    this.setState({remaining});
   }
 
   render() {
diff --git a/src/components/CountdownTimer/CountdownTimer.jsx b/src/components/CountdownTimer/CountdownTimer.jsx
index 7813444..2b580c3 100644
--- a/src/components/CountdownTimer/CountdownTimer.jsx
+++ b/src/components/CountdownTimer/CountdownTimer.jsx
@@ -1,22 +1,17 @@
-
-import React, { Component } from 'react';
+import React from 'react';
 import CSSModules from 'react-css-modules';
 import Countdown from './Countdown';
 
 import styles from './CountdownTimer.scss';
 
-class CountdownTimer extends Component {
-  componentDidMount() {
+const CountdownTimer = () => {
+  const OPTIONS = {endDate: '12/20/2016 12:12 AM', prefix: ''};
 
-  }
-  render() {
-    const OPTIONS = { endDate: '12/20/2016 12:12 AM', prefix: '' };
+  return (
+    <div>
+      <Countdown options={OPTIONS} />
+    </div>
+  );
+};
 
-    return (
-      <div>
-        <Countdown options={OPTIONS} />
-      </div>
-    );
-  }
-}
 export default CSSModules(CountdownTimer, styles);
diff --git a/src/components/CountdownTimer/DateBetween.js b/src/components/CountdownTimer/DateBetween.js
index 8e4d4ac..916cb8e 100644
--- a/src/components/CountdownTimer/DateBetween.js
+++ b/src/components/CountdownTimer/DateBetween.js
@@ -11,7 +11,9 @@ function DateBetween(startDate, endDate) {
 
   function pad(num, size) {
     let s = String(num);
-    while (s.length < (size || 2)) { s = `0${s}`; }
+    while (s.length < (size || 2)) {
+      s = `0${s}`;
+    }
     return s;
   }
 
@@ -29,4 +31,4 @@ function DateBetween(startDate, endDate) {
   return between;
 }
 
-module.exports = DateBetween;
+export default DateBetween;
diff --git a/src/components/DatePicker/DatePicker.jsx b/src/components/DatePicker/DatePicker.jsx
index 86f0360..9408231 100644
--- a/src/components/DatePicker/DatePicker.jsx
+++ b/src/components/DatePicker/DatePicker.jsx
@@ -1,9 +1,9 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import { DateField, TransitionView, Calendar } from 'react-date-picker';
+import {DateField, TransitionView, Calendar} from 'react-date-picker';
 import styles from './DatePicker.scss';
 
-export const DatePicker = ({ onChange, value }) => (
+export const DatePicker = ({onChange, value}) => (
   <div styleName="date-picker">
     <DateField
       dateFormat="YYYY-MM-DD hh:mm:ss A"
@@ -11,7 +11,7 @@ export const DatePicker = ({ onChange, value }) => (
       value={value}
     >
       <TransitionView>
-        <Calendar style={{ padding: 10 }} />
+        <Calendar style={{padding: 10}} />
       </TransitionView>
     </DateField>
   </div>
diff --git a/src/components/Dropdown/Dropdown.jsx b/src/components/Dropdown/Dropdown.jsx
index c6d7251..d0a020b 100644
--- a/src/components/Dropdown/Dropdown.jsx
+++ b/src/components/Dropdown/Dropdown.jsx
@@ -1,9 +1,9 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import ReactDropdown, { DropdownTrigger, DropdownContent } from 'react-simple-dropdown';
+import ReactDropdown, {DropdownTrigger, DropdownContent} from 'react-simple-dropdown';
 import styles from './Dropdown.scss';
 
-export const Dropdown = ({ title, children }) => (
+export const Dropdown = ({title, children}) => (
   <div styleName="dropdown">
     <ReactDropdown>
       <DropdownTrigger className={styles.trigger}>{title}</DropdownTrigger>
diff --git a/src/components/FormField/FormField.jsx b/src/components/FormField/FormField.jsx
index 942e7c0..09c19bf 100644
--- a/src/components/FormField/FormField.jsx
+++ b/src/components/FormField/FormField.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import cn from 'classnames';
 import styles from './FormField.scss';
@@ -19,4 +19,4 @@ FormField.propTypes = {
   children: PropTypes.any.isRequired,
 };
 
-export default CSSModules(FormField, styles, { allowMultiple: true });
+export default CSSModules(FormField, styles, {allowMultiple: true});
diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx
index c157292..f92f525 100644
--- a/src/components/Header/Header.jsx
+++ b/src/components/Header/Header.jsx
@@ -1,28 +1,30 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import { Link } from 'react-router';
-import LogInModalContainer from 'routes/Home/containers/LogInModalContainer';
+import {Link} from 'react-router';
+import LogInModalContainer from 'routes/Home/containers/LoginModalContainer';
 import SignupModalContainer from 'routes/Home/containers/SignupModalContainer';
 import SearchInput from '../SearchInput';
 import Dropdown from '../Dropdown';
 import Notification from '../Notification';
 import styles from './Header.scss';
 
-export const Header = ({location, selectedCategory, categories, user, notifications,
-  routes, handleNotification, toggleNotif, loggedUser}) => (
+export const Header = ({
+  location, selectedCategory, categories, user, notifications,
+  routes, handleNotification, toggleNotif, loggedUser,
+}) => (
 
-    <nav styleName="header">
-      <ul>
-        <li styleName="branding">
+  <nav styleName="header">
+    <ul>
+      <li styleName="branding">
         DRONE MARKET
       </li>
-        {
+      {
         (() => {
           const currentRoute = routes[routes.length - 1].name;
           if (currentRoute === 'ServiceRequest'
-			  || currentRoute === 'Home'
-              || currentRoute === 'MyRequestStatus'
-              || currentRoute === 'StatusDetail') {
+            || currentRoute === 'Home'
+            || currentRoute === 'MyRequestStatus'
+            || currentRoute === 'StatusDetail') {
             return (
             [(<li key="location" styleName="location">
               <i />
@@ -37,37 +39,46 @@ export const Header = ({location, selectedCategory, categories, user, notificati
           return (
             <li styleName="pages">
               <ul>
-                <li className={currentRoute === 'Dashboard' ? 'active' : null}><Link to="/dashboard">Dashboard</Link></li>
-                <li className={currentRoute === 'Requests' ? 'active' : null}><Link to="/my-request">Requests</Link></li>
-                <li className={currentRoute === 'My Drones' ? 'active' : null}><Link to="/my-drone" activeClassName="active">My Drones</Link></li>
-                <li className={currentRoute === 'My Services' ? 'active' : null}><Link to="/my-services" activeClassName="active">My Services</Link></li>
+                <li className={currentRoute === 'Dashboard' ? 'active' : null}>
+                  <Link to="/dashboard">Dashboard</Link>
+                </li>
+                <li className={currentRoute === 'Requests' ? 'active' : null}>
+                  <Link to="/my-request">Requests</Link>
+                </li>
+                <li className={currentRoute === 'My Drones' ? 'active' : null}>
+                  <Link to="/my-drone" activeClassName="active">My Drones</Link>
+                </li>
+                <li className={currentRoute === 'My Services' ? 'active' : null}>
+                  <Link to="/my-services" activeClassName="active">My Services</Link>
+                </li>
                 <li><Link to="javascript:;" activeClassName="active">Analytics</Link></li>
-                <li className={currentRoute === 'DroneMap' ? 'active' : null}><Link to="/drones-map">Drone Traffic</Link></li>
-                <li className={currentRoute === 'MissionPlanner' ? 'active' : null}><Link to="/mission-planner">MissionPlanner</Link></li>
+                <li className={currentRoute === 'DroneMap' ? 'active' : null}>
+                  <Link to="/drones-map">Drone Traffic</Link></li>
+                <li className={currentRoute === 'MissionPlanner' ? 'active' : null}>
+                  <Link to="/mission-planner">MissionPlanner</Link></li>
               </ul>
             </li>
           );
         })()
       }
-        {
+      {
         (() => {
-          const isLoggedIn = false;
           if (!loggedUser) {
             return (
             [
-              (<li key="category">
-                <Dropdown title={selectedCategory}>
-                  <ul>
-                    {categories.map((item, i) => <li key={i}><a href="/service/javascript:">{item.name}</a></li>)}
-                  </ul>
-                </Dropdown>
-              </li>),
-              (<li key="login" styleName="login">
-                <LogInModalContainer />
-              </li>),
-              (<li key="signup" styleName="login">
-                <SignupModalContainer />
-              </li>),
+                (<li key="category">
+                  <Dropdown title={selectedCategory}>
+                    <ul>
+                      {categories.map((item, i) => <li key={i}><a href="/service/javascript:">{item.name}</a></li>)}
+                    </ul>
+                  </Dropdown>
+                </li>),
+                (<li key="login" styleName="login">
+                  <LogInModalContainer />
+                </li>),
+                (<li key="signup" styleName="login">
+                  <SignupModalContainer />
+                </li>),
             ]
             );
           }
@@ -75,7 +86,10 @@ export const Header = ({location, selectedCategory, categories, user, notificati
           [
               (<li key="notification" styleName="notifications" onClick={() => handleNotification(!toggleNotif)}>
                 {notifications.length > 0 && <span styleName="counter">{notifications.length}</span>}
-                {toggleNotif && <Notification notifications={notifications} toggleNotif={toggleNotif} handleNotification={handleNotification} />}
+                {toggleNotif && <Notification
+                  notifications={notifications} toggleNotif={toggleNotif}
+                  handleNotification={handleNotification}
+                />}
               </li>),
               (<li key="category">
                 <Dropdown title={selectedCategory}>
@@ -101,8 +115,8 @@ export const Header = ({location, selectedCategory, categories, user, notificati
         })()
       }
 
-      </ul>
-    </nav>
+    </ul>
+  </nav>
 );
 
 Header.propTypes = {
@@ -115,7 +129,6 @@ Header.propTypes = {
   handleNotification: PropTypes.func,
   toggleNotif: PropTypes.bool,
   loggedUser: PropTypes.bool,
-  isLoggedIn: PropTypes.bool,
 };
 
 export default CSSModules(Header, styles);
diff --git a/src/components/InfoIcon/InfoIcon.jsx b/src/components/InfoIcon/InfoIcon.jsx
index 836cbb0..d31e224 100644
--- a/src/components/InfoIcon/InfoIcon.jsx
+++ b/src/components/InfoIcon/InfoIcon.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import Tooltip from 'rc-tooltip';
 import styles from './InfoIcon.scss';
@@ -13,6 +13,8 @@ export const InfoIcon = ({children, cName, position}) => (
 
 InfoIcon.propTypes = {
   children: PropTypes.any.isRequired,
+  cName: PropTypes.string,
+  position: PropTypes.string,
 };
 
 export default CSSModules(InfoIcon, styles);
diff --git a/src/components/InfoWindow/InfoWindow.jsx b/src/components/InfoWindow/InfoWindow.jsx
index 66c669f..12821fa 100644
--- a/src/components/InfoWindow/InfoWindow.jsx
+++ b/src/components/InfoWindow/InfoWindow.jsx
@@ -1,6 +1,6 @@
-import React, { Component, PropTypes } from 'react';
+import React, {Component, PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import { Grid, Row, Col } from 'react-flexbox-grid/lib/index';
+import {Grid, Row, Col} from 'react-flexbox-grid/lib/index';
 import TextField from 'components/TextField';
 import styles from './InfoWindow.scss';
 import Select from '../Select';
@@ -80,7 +80,7 @@ class InfoWindow extends Component {
 
   toggleFullBody() {
     const newState = this.state.fullBody === 'hidden' ? 'visible' : 'hidden';
-    this.setState({ fullBody: newState });
+    this.setState({fullBody: newState});
   }
 
   handleNumberChange(name, event) {
diff --git a/src/components/MapLegends/MapLegends.jsx b/src/components/MapLegends/MapLegends.jsx
index 0142772..eeb596f 100644
--- a/src/components/MapLegends/MapLegends.jsx
+++ b/src/components/MapLegends/MapLegends.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './MapLegends.scss';
 
diff --git a/src/components/Notification/Notification.jsx b/src/components/Notification/Notification.jsx
index 16193b1..5410b1d 100644
--- a/src/components/Notification/Notification.jsx
+++ b/src/components/Notification/Notification.jsx
@@ -1,6 +1,5 @@
-import React, { PropTypes, Component } from 'react';
+import React, {PropTypes, Component} from 'react';
 import CSSModules from 'react-css-modules';
-import _ from 'lodash';
 import enhanceWithClickOutside from 'react-click-outside';
 import styles from './Notification.scss';
 import NotificationRow from './NotificationRow';
@@ -10,8 +9,9 @@ class Notification extends Component {
   handleClickOutside() {
     this.props.handleNotification(!this.props.toggleNotif);
   }
+
   render() {
-    const {toggleNotif, handleNotification, notifications} = this.props;
+    const {notifications} = this.props;
     return (
       <div styleName="notifications">
         <div styleName="notifications-head">
@@ -19,9 +19,11 @@ class Notification extends Component {
         </div>
         <div styleName="notifications-rows">
           {
-           notifications.map((notification, i) => (
-             <div key={i} className={styles.notifiRow}><NotificationRow notification={notification} /></div>
-			      ))
+            notifications.map((notification, i) => (
+              <div key={i} className={styles.notifiRow}>
+                <NotificationRow notification={notification} />
+              </div>
+            ))
           }
         </div>
         <div styleName="notifications-footer">
@@ -32,8 +34,10 @@ class Notification extends Component {
   }
 }
 
-Notification.defaultProps = {
+Notification.propTypes = {
   notifications: PropTypes.array.isRequired,
+  toggleNotif: PropTypes.bool,
+  handleNotification: PropTypes.func,
 };
 
 export default enhanceWithClickOutside(CSSModules(Notification, styles));
diff --git a/src/components/Notification/NotificationRow/NotificationRow.jsx b/src/components/Notification/NotificationRow/NotificationRow.jsx
index 80f7c43..dacd510 100644
--- a/src/components/Notification/NotificationRow/NotificationRow.jsx
+++ b/src/components/Notification/NotificationRow/NotificationRow.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './NotificationRow.scss';
 
@@ -7,16 +7,16 @@ export const NotificationRow = ({notification}) => (
     <div styleName="notification-row">
       <div styleName="notification-icon">
         {
-	  			notification.status === 'completed' && <i styleName="icon-notif-green" />
-	  		}
+          notification.status === 'completed' && <i styleName="icon-notif-green" />
+        }
         {
-	  			notification.status === 'started' && <i styleName="icon-notif-grey" />
-	  		}
+          notification.status === 'started' && <i styleName="icon-notif-grey" />
+        }
       </div>
       <div styleName="notification-detail">
         <p>
-          <a href="/service/javascript:;">{notification.droneName} </a>has {notification.status} your "Deliver My Package" request.
-	  		</p>
+          <a href="/service/javascript:;">{notification.droneName} </a> has {notification.status} your {'"Deliver My Package"'} request.
+        </p>
         <div styleName="time">
           {notification.time}
         </div>
@@ -25,7 +25,7 @@ export const NotificationRow = ({notification}) => (
   </div>
 );
 
-NotificationRow.defaultProps = {
+NotificationRow.propTypes = {
   notification: PropTypes.object.isRequired,
 };
 
diff --git a/src/components/Pagination/Pagination.jsx b/src/components/Pagination/Pagination.jsx
index d6f360b..52b333c 100644
--- a/src/components/Pagination/Pagination.jsx
+++ b/src/components/Pagination/Pagination.jsx
@@ -1,13 +1,13 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import _ from 'lodash';
 import styles from './Pagination.scss';
 import Select from '../Select';
 
 const pageOptions = [
-  { value: 10, label: '10' },
-  { value: 30, label: '30' },
-  { value: 50, label: '50' },
+  {value: 10, label: '10'},
+  {value: 30, label: '30'},
+  {value: 50, label: '50'},
 ];
 
 
diff --git a/src/components/Rate/Rate.jsx b/src/components/Rate/Rate.jsx
index 1922d83..04648cd 100644
--- a/src/components/Rate/Rate.jsx
+++ b/src/components/Rate/Rate.jsx
@@ -1,9 +1,9 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import StarRatingComponent from 'react-star-rating-component';
 import styles from './Rate.scss';
 
-export const Rate = ({ value, onChange, size }) => (
+export const Rate = ({value, onChange, size}) => (
   <StarRatingComponent
     name="rate"
     starCount={5}
diff --git a/src/components/Row/Row.jsx b/src/components/Row/Row.jsx
index 691fc34..5af3cdb 100644
--- a/src/components/Row/Row.jsx
+++ b/src/components/Row/Row.jsx
@@ -1,10 +1,10 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './Row.scss';
 
-export const Row = ({ children }) => (
+export const Row = ({children}) => (
   <div styleName="row">
-    {children.map((item, i) => <div key={i} styleName="col" style={{ width: `${100 / children.length}%` }}>{item}</div>)}
+    {children.map((item, i) => <div key={i} styleName="col" style={{width: `${100 / children.length}%`}}>{item}</div>)}
   </div>
 );
 
diff --git a/src/components/SelectDropdown/SelectDropdown.jsx b/src/components/SelectDropdown/SelectDropdown.jsx
index 6b796ba..09f87f0 100644
--- a/src/components/SelectDropdown/SelectDropdown.jsx
+++ b/src/components/SelectDropdown/SelectDropdown.jsx
@@ -1,16 +1,20 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import ReactDropdown, { DropdownTrigger, DropdownContent } from 'react-simple-dropdown';
+import ReactDropdown, {DropdownTrigger, DropdownContent} from 'react-simple-dropdown';
 import _ from 'lodash';
 import styles from './SelectDropdown.scss';
 
-export const SelectDropdown = ({ options, value, onChange }) => {
+export const SelectDropdown = ({options, value, onChange}) => {
   let dropdownRef;
 
   return (
     <div styleName="select-dropdown">
-      <ReactDropdown ref={(dropdown) => { dropdownRef = dropdown; }}>
-        <DropdownTrigger className={styles.trigger}>{(_.find(options, { value }) || options[0]).label}</DropdownTrigger>
+      <ReactDropdown
+        ref={(dropdown) => {
+          dropdownRef = dropdown;
+        }}
+      >
+        <DropdownTrigger className={styles.trigger}>{(_.find(options, {value}) || options[0]).label}</DropdownTrigger>
         <DropdownContent className={styles.content}>
           <ul>
             {options.map((option) => (
diff --git a/src/components/StatusIcon/StatusIcon.jsx b/src/components/StatusIcon/StatusIcon.jsx
index 094b1e3..87e3323 100644
--- a/src/components/StatusIcon/StatusIcon.jsx
+++ b/src/components/StatusIcon/StatusIcon.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './StatusIcon.scss';
 
diff --git a/src/components/StatusLabel/StatusLabel.jsx b/src/components/StatusLabel/StatusLabel.jsx
index 5efed45..08a11cc 100644
--- a/src/components/StatusLabel/StatusLabel.jsx
+++ b/src/components/StatusLabel/StatusLabel.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './StatusLabel.scss';
 
@@ -8,7 +8,7 @@ const statusLabels = {
   completed: 'Completed',
 };
 
-export const StatusLabel = ({ value }) => (
+export const StatusLabel = ({value}) => (
   <span styleName={`status-label_${value.toLowerCase()}`}>
     <span>{statusLabels[value]}</span>
   </span>
diff --git a/src/components/Tabs/Tabs.jsx b/src/components/Tabs/Tabs.jsx
index 7385cc3..567da7c 100644
--- a/src/components/Tabs/Tabs.jsx
+++ b/src/components/Tabs/Tabs.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './Tabs.scss';
 
diff --git a/src/components/TextField/TextField.jsx b/src/components/TextField/TextField.jsx
index d952501..ffc768b 100644
--- a/src/components/TextField/TextField.jsx
+++ b/src/components/TextField/TextField.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import _ from 'lodash';
 import cn from 'classnames';
@@ -11,9 +11,11 @@ export const TextField = (props) => (
 );
 
 TextField.propTypes = {
-  type: PropTypes.oneOf(['text', 'email','password']),
+  type: PropTypes.oneOf(['text', 'email', 'password']),
   size: PropTypes.oneOf(['normal', 'narrow']),
   readOnly: PropTypes.bool,
+  label: PropTypes.string,
+  login: PropTypes.bool,
 };
 
 TextField.defaultProps = {
diff --git a/src/containers/AppContainer.jsx b/src/containers/AppContainer.jsx
index 513e305..92f964a 100644
--- a/src/containers/AppContainer.jsx
+++ b/src/containers/AppContainer.jsx
@@ -1,10 +1,10 @@
-import React, { PropTypes } from 'react';
-import { ReduxAsyncConnect } from 'redux-connect';
-import { Router } from 'react-router';
-import { Provider } from 'react-redux';
+import React, {PropTypes} from 'react';
+import {ReduxAsyncConnect} from 'redux-connect';
+import {Router} from 'react-router';
+import {Provider} from 'react-redux';
 import ReduxToastr from 'react-redux-toastr';
 
-const AppContainer = ({ history, routes, routerKey, store }) => (
+const AppContainer = ({history, routes, routerKey, store}) => (
   <Provider store={store}>
     <div>
       <Router history={history} render={(props) => <ReduxAsyncConnect {...props} />} key={routerKey}>{routes}</Router>
diff --git a/src/containers/HeaderContainer.js b/src/containers/HeaderContainer.js
index 6a4e992..9128459 100644
--- a/src/containers/HeaderContainer.js
+++ b/src/containers/HeaderContainer.js
@@ -1,6 +1,6 @@
 import Header from 'components/Header';
-import { asyncConnect } from 'redux-connect';
-import { actions, toggleNotification, loginAction } from '../store/modules/global';
+import {asyncConnect} from 'redux-connect';
+import {toggleNotification, loginAction} from '../store/modules/global';
 
 const resolve = [{
   promise: () => Promise.resolve(),
diff --git a/src/containers/HeaderContainer2.js b/src/containers/HeaderContainer2.js
index 99b93fd..7c7554d 100644
--- a/src/containers/HeaderContainer2.js
+++ b/src/containers/HeaderContainer2.js
@@ -1,5 +1,5 @@
 import Header2 from 'components/Header2';
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 
 const mapState = (state) => state.global;
 
diff --git a/src/layouts/CoreLayout/CoreLayout.jsx b/src/layouts/CoreLayout/CoreLayout.jsx
index 5ca79e9..3f09e24 100644
--- a/src/layouts/CoreLayout/CoreLayout.jsx
+++ b/src/layouts/CoreLayout/CoreLayout.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import HeaderContainer from 'containers/HeaderContainer';
 import Breadcrumbs from 'react-breadcrumbs';
diff --git a/src/main.jsx b/src/main.jsx
index 741733f..0f35597 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -1,8 +1,10 @@
+/* eslint import/no-commonjs: 0 */
+
 import React from 'react';
 import ReactDOM from 'react-dom';
 import bluebird from 'bluebird';
-import { browserHistory } from 'react-router';
-import { syncHistoryWithStore } from 'react-router-redux';
+import {browserHistory} from 'react-router';
+import {syncHistoryWithStore} from 'react-router-redux';
 import createStore from './store/createStore';
 import AppContainer from './containers/AppContainer';
 
diff --git a/src/routes/AddServices/components/AddPackages/AddPackages.jsx b/src/routes/AddServices/components/AddPackages/AddPackages.jsx
index ea6805c..627c395 100644
--- a/src/routes/AddServices/components/AddPackages/AddPackages.jsx
+++ b/src/routes/AddServices/components/AddPackages/AddPackages.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import Checkbox from 'components/Checkbox';
 import TextField from 'components/TextField';
diff --git a/src/routes/AddServices/components/AddServicesForm/AddServicesForm.jsx b/src/routes/AddServices/components/AddServicesForm/AddServicesForm.jsx
index dad6f13..d6bc0f2 100644
--- a/src/routes/AddServices/components/AddServicesForm/AddServicesForm.jsx
+++ b/src/routes/AddServices/components/AddServicesForm/AddServicesForm.jsx
@@ -1,10 +1,10 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import Button from 'components/Button';
 import TextField from 'components/TextField';
 import FormField from 'components/FormField';
 import TextareaField from 'components/TextareaField';
-import { reduxForm } from 'redux-form';
+import {reduxForm} from 'redux-form';
 import styles from './AddServicesForm.scss';
 import AddPackages from '../AddPackages';
 
@@ -83,4 +83,4 @@ const validate = (values) => {
   return errors;
 };
 
-export default reduxForm({ form: 'editDrones', fields, validate })(CSSModules(AddServicesForm, styles));
+export default reduxForm({form: 'editDrones', fields, validate})(CSSModules(AddServicesForm, styles));
diff --git a/src/routes/AddServices/containers/AddServicesContainer.js b/src/routes/AddServices/containers/AddServicesContainer.js
index f5c88f3..5363cc0 100644
--- a/src/routes/AddServices/containers/AddServicesContainer.js
+++ b/src/routes/AddServices/containers/AddServicesContainer.js
@@ -1,4 +1,4 @@
-import { asyncConnect } from 'redux-connect';
+import {asyncConnect} from 'redux-connect';
 import {actions} from '../modules/AddServices';
 
 import AddServicesView from '../components/AddServicesView';
diff --git a/src/routes/AddServices/containers/AddServicesFormContainer.js b/src/routes/AddServices/containers/AddServicesFormContainer.js
index b5514a6..e78d1ca 100644
--- a/src/routes/AddServices/containers/AddServicesFormContainer.js
+++ b/src/routes/AddServices/containers/AddServicesFormContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import {sendRequest, addPackagesAction} from '../modules/AddServices';
 
 import AddServicesForm from '../components/AddServicesForm';
diff --git a/src/routes/AddServices/index.js b/src/routes/AddServices/index.js
index 0e1f35a..29dc056 100644
--- a/src/routes/AddServices/index.js
+++ b/src/routes/AddServices/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'add-services',
@@ -9,7 +9,7 @@ export default (store) => ({
       const AddServices = require('./containers/AddServicesContainer').default;
       const reducer = require('./modules/AddServices').default;
 
-      injectReducer(store, { key: 'addServices', reducer });
+      injectReducer(store, {key: 'addServices', reducer});
       cb(null, AddServices);
     }, 'AddServices');
   },
diff --git a/src/routes/AddServices/modules/AddServices.js b/src/routes/AddServices/modules/AddServices.js
index a26bd8b..70b8010 100644
--- a/src/routes/AddServices/modules/AddServices.js
+++ b/src/routes/AddServices/modules/AddServices.js
@@ -1,4 +1,4 @@
-import { handleActions, createAction } from 'redux-actions';
+import {handleActions, createAction} from 'redux-actions';
 
 
 // ------------------------------------
diff --git a/src/routes/AvailablePackages/components/AvailablePackagesItem/AvailablePackagesItem.jsx b/src/routes/AvailablePackages/components/AvailablePackagesItem/AvailablePackagesItem.jsx
index e9bfd69..03a4974 100644
--- a/src/routes/AvailablePackages/components/AvailablePackagesItem/AvailablePackagesItem.jsx
+++ b/src/routes/AvailablePackages/components/AvailablePackagesItem/AvailablePackagesItem.jsx
@@ -1,15 +1,15 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import { Link } from 'react-router';
+import {Link} from 'react-router';
 import styles from './AvailablePackagesItem.scss';
 import Button from 'components/Button';
 import ModalPackageDetail from '../ModalPackageDetail';
 
-{
+
 /*
 * AvailablePackagesItem
 */
-}
+
 export const AvailablePackagesItem = ({availablePackagesItemData}) => (
   <div styleName="available-pakages-item">
     <div styleName="pakages-header">
diff --git a/src/routes/AvailablePackages/components/AvailablePackagesList/AvailablePackagesList.jsx b/src/routes/AvailablePackages/components/AvailablePackagesList/AvailablePackagesList.jsx
index 7fe55d5..27fc49c 100644
--- a/src/routes/AvailablePackages/components/AvailablePackagesList/AvailablePackagesList.jsx
+++ b/src/routes/AvailablePackages/components/AvailablePackagesList/AvailablePackagesList.jsx
@@ -1,14 +1,11 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './AvailablePackagesList.scss';
-import Button from 'components/Button';
 import AvailablePackagesItem from '../AvailablePackagesItem';
 
-{
 /*
 * AvailablePackagesList
 */
-}
 export const AvailablePackagesList = ({availablePackagesData}) => (
   <div styleName="available-pakages">
     <div styleName="packages-head">
@@ -24,6 +21,7 @@ export const AvailablePackagesList = ({availablePackagesData}) => (
 );
 
 AvailablePackagesList.propTypes = {
+  availablePackagesData: PropTypes.array.isRequired,
 };
 
 export default CSSModules(AvailablePackagesList, styles);
diff --git a/src/routes/AvailablePackages/components/DroneDetailBanner/DroneDetailBanner.jsx b/src/routes/AvailablePackages/components/DroneDetailBanner/DroneDetailBanner.jsx
index 779f43e..84badcf 100644
--- a/src/routes/AvailablePackages/components/DroneDetailBanner/DroneDetailBanner.jsx
+++ b/src/routes/AvailablePackages/components/DroneDetailBanner/DroneDetailBanner.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './DroneDetailBanner.scss';
 
@@ -7,7 +7,7 @@ const getImage = (name) => `${window.location.origin}/img/drones/${name}`;
 /*
 * DroneDetailBanner
 */
-export const DroneDetailBanner = ({}) => (
+export const DroneDetailBanner = () => (
   <div styleName="drone-detail-banner">
     <ul>
       <li>
diff --git a/src/routes/AvailablePackages/components/ModalPackageDetail/ModalPackageDetail.jsx b/src/routes/AvailablePackages/components/ModalPackageDetail/ModalPackageDetail.jsx
index e2ff13b..b40cba6 100644
--- a/src/routes/AvailablePackages/components/ModalPackageDetail/ModalPackageDetail.jsx
+++ b/src/routes/AvailablePackages/components/ModalPackageDetail/ModalPackageDetail.jsx
@@ -1,16 +1,11 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import { Link } from 'react-router';
-import Button from 'components/Button';
 import styles from './ModalPackageDetail.scss';
+import Modal from 'react-modal';
 
-const Modal = require('react-modal');
-
-{
 /*
 * customStyles
 */
-}
 const customStyles = {
   overlay: {
     position: 'absolute',
@@ -39,26 +34,24 @@ const customStyles = {
 
 const getImage = (name) => `${window.location.origin}/img/drones/${name}`;
 
-const ModalPackageDetail = React.createClass({
+class ModalPackageDetail extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {modalIsOpen: false};
 
-  getInitialState() {
-    return { modalIsOpen: false };
-  },
-
-  openModal() {
-    this.setState({modalIsOpen: true});
-  },
+    this.openModal = () => {
+      this.setState({modalIsOpen: true});
+    };
 
-  afterOpenModal() {
-  },
+    this.closeModal = () => {
+      this.setState({modalIsOpen: false});
+    };
 
-  closeModal() {
-    this.setState({modalIsOpen: false});
-  },
-  markAsComplete() {
-    this.setState({modalIsOpen: false});
-    this.props.handleStatus('Completed');
-  },
+    this.markAsComplete = () => {
+      this.setState({modalIsOpen: false});
+      this.props.handleStatus('Completed');
+    };
+  }
 
   render() {
     return (
@@ -68,7 +61,6 @@ const ModalPackageDetail = React.createClass({
         {this.state.modalIsOpen && <div styleName="overlay-bg" />}
         <Modal
           isOpen={this.state.modalIsOpen}
-          onAfterOpen={this.afterOpenModal}
           onRequestClose={this.closeModal}
           style={customStyles}
           contentLabel="Example Modal"
@@ -93,26 +85,27 @@ const ModalPackageDetail = React.createClass({
 
               <div styleName="drone-info">
                 <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus
-                accumsan et vivez rra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient
-                montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien
-                nunc eget odio. Lorem ipsum dolor sit amet, consectetur adipiscing elit. </p>
+                  accumsan et vivez rra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient
+                  montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien
+                  nunc eget odio. Lorem ipsum dolor sit amet, consectetur adipiscing elit. </p>
                 <p>Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum.
-                Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores
-                legere me lius quod ii legunt saepius.</p>
+                  Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores
+                  legere me lius quod ii legunt saepius.</p>
                 <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus
-                accumsan et viverra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient
-                montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien
-                nunc eget odio. Lorem ipsum dolor sit amet, consectetur adipiscing elit. </p>
+                  accumsan et viverra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient
+                  montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien
+                  nunc eget odio. Lorem ipsum dolor sit amet, consectetur adipiscing elit. </p>
               </div>
             </div>
           </div>
         </Modal>
       </div>
     );
-  },
-});
+  }
+}
 
 ModalPackageDetail.propTypes = {
+  handleStatus: PropTypes.func.isRequired,
 };
 
 export default CSSModules(ModalPackageDetail, styles);
diff --git a/src/routes/AvailablePackages/containers/AvailablePackagesContainer.js b/src/routes/AvailablePackages/containers/AvailablePackagesContainer.js
index 67a02df..59a05ca 100644
--- a/src/routes/AvailablePackages/containers/AvailablePackagesContainer.js
+++ b/src/routes/AvailablePackages/containers/AvailablePackagesContainer.js
@@ -1,4 +1,4 @@
-import { asyncConnect } from 'redux-connect';
+import {asyncConnect} from 'redux-connect';
 import {actions} from '../modules/AvailablePackages';
 
 import AvailablePackagesView from '../components/AvailablePackagesView';
diff --git a/src/routes/AvailablePackages/index.js b/src/routes/AvailablePackages/index.js
index d9e0aae..14f16f1 100644
--- a/src/routes/AvailablePackages/index.js
+++ b/src/routes/AvailablePackages/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'available-packages',
@@ -8,7 +8,7 @@ export default (store) => ({
       const AvailablePackages = require('./containers/AvailablePackagesContainer').default;
       const reducer = require('./modules/AvailablePackages').default;
 
-      injectReducer(store, { key: 'availablePackages', reducer });
+      injectReducer(store, {key: 'availablePackages', reducer});
       cb(null, AvailablePackages);
     }, 'AvailablePackages');
   },
diff --git a/src/routes/AvailablePackages/modules/AvailablePackages.js b/src/routes/AvailablePackages/modules/AvailablePackages.js
index 17e5231..ee6aadb 100644
--- a/src/routes/AvailablePackages/modules/AvailablePackages.js
+++ b/src/routes/AvailablePackages/modules/AvailablePackages.js
@@ -1,4 +1,4 @@
-import { handleActions } from 'redux-actions';
+import {handleActions} from 'redux-actions';
 
 
 // ------------------------------------
@@ -12,36 +12,46 @@ export const sendRequest = (values) => new Promise((resolve) => {
 });
 
 
-export const actions = {
-};
+export const actions = {};
 
 // ------------------------------------
 // Reducer
 // ------------------------------------
-export default handleActions({
-
-}, {
+export default handleActions({}, {
   // initial data
   availablePackagesData: [
     {
-      packageType: 'Bronze Package', packageIcon: 'icon-bronze',
-      description: 'Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis ', delvSpeed: '5 mph',
-      costPerMile: '$ 10.00', insuranceClaim: 'No',
-      maxWeight: '1 kg', packagePrice: '$50.00', regularPrice: '$75.00',
+      packageType: 'Bronze Package',
+      packageIcon: 'icon-bronze',
+      description: 'Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis ',
+      delvSpeed: '5 mph',
+      costPerMile: '$ 10.00',
+      insuranceClaim: 'No',
+      maxWeight: '1 kg',
+      packagePrice: '$50.00',
+      regularPrice: '$75.00',
     },
     {
-      packageType: 'Silver Package', packageIcon: 'icon-silver',
-      description: 'Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis ', delvSpeed: '5 mph',
-      costPerMile: '$ 12.00', insuranceClaim: 'up to $6k',
-      maxWeight: '2 kg', packagePrice: '$70.00', regularPrice: '$100.00',
+      packageType: 'Silver Package',
+      packageIcon: 'icon-silver',
+      description: 'Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis ',
+      delvSpeed: '5 mph',
+      costPerMile: '$ 12.00',
+      insuranceClaim: 'up to $6k',
+      maxWeight: '2 kg',
+      packagePrice: '$70.00',
+      regularPrice: '$100.00',
     },
     {
-      packageType: 'Gold Package', packageIcon: 'icon-gold',
-      description: 'Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis ', delvSpeed: '5 mph',
-      costPerMile: '$ 14.00', insuranceClaim: 'up to $7k',
-      maxWeight: '3 kg', packagePrice: '$100.00', regularPrice: '$125.00',
+      packageType: 'Gold Package',
+      packageIcon: 'icon-gold',
+      description: 'Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis ',
+      delvSpeed: '5 mph',
+      costPerMile: '$ 14.00',
+      insuranceClaim: 'up to $7k',
+      maxWeight: '3 kg',
+      packagePrice: '$100.00',
+      regularPrice: '$125.00',
     },
   ],
-
-
 });
diff --git a/src/routes/BrowseProvider/components/BrowseProviderHeader/BrowseProviderHeader.jsx b/src/routes/BrowseProvider/components/BrowseProviderHeader/BrowseProviderHeader.jsx
index bc93a8c..bc630a0 100644
--- a/src/routes/BrowseProvider/components/BrowseProviderHeader/BrowseProviderHeader.jsx
+++ b/src/routes/BrowseProvider/components/BrowseProviderHeader/BrowseProviderHeader.jsx
@@ -1,19 +1,17 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import Dropdown from 'react-dropdown';
 import styles from './BrowseProviderHeader.scss';
 
 const options = [
-  { value: 1, label: 'Popularity' },
-  { value: 2, label: 'Rating' },
-  { value: 3, label: 'Distance' },
-  { value: 4, label: 'Name' },
+  {value: 1, label: 'Popularity'},
+  {value: 2, label: 'Rating'},
+  {value: 3, label: 'Distance'},
+  {value: 4, label: 'Name'},
 ];
 
 const defaultOption = options[0];
-function onChange(val) {
-  console.log(val.value);
-}
+
 export const BrowseProviderHeader = ({handleFilterToggle, toggleFilterValue}) => (
   <div styleName="browse-provider-header">
     <div styleName="search-filter-row">
@@ -23,7 +21,7 @@ export const BrowseProviderHeader = ({handleFilterToggle, toggleFilterValue}) =>
       </div>
 
       <div styleName="filter">
-        <a href="/service/javascript:;" styleName="filter-btn" onClick={(e) => handleFilterToggle(!toggleFilterValue)}>
+        <a href="/service/javascript:;" styleName="filter-btn" onClick={() => handleFilterToggle(!toggleFilterValue)}>
           {!toggleFilterValue && <span>Filter</span>}
           {!toggleFilterValue && <i styleName="icon-filter" />}
           {toggleFilterValue && <span>Cancel</span>}
@@ -38,7 +36,6 @@ export const BrowseProviderHeader = ({handleFilterToggle, toggleFilterValue}) =>
           <span />
           <Dropdown
             options={options}
-            onChange={onChange}
             value={defaultOption}
             placeholder=""
           />
@@ -49,6 +46,8 @@ export const BrowseProviderHeader = ({handleFilterToggle, toggleFilterValue}) =>
 );
 
 BrowseProviderHeader.propTypes = {
+  handleFilterToggle: PropTypes.func,
+  toggleFilterValue: PropTypes.bool,
 };
 
 export default CSSModules(BrowseProviderHeader, styles);
diff --git a/src/routes/BrowseProvider/components/BrowseProviderView.jsx b/src/routes/BrowseProvider/components/BrowseProviderView.jsx
index 94310fd..70411c2 100644
--- a/src/routes/BrowseProvider/components/BrowseProviderView.jsx
+++ b/src/routes/BrowseProvider/components/BrowseProviderView.jsx
@@ -26,6 +26,8 @@ export const BrowseProviderView = ({providers, handleFilterToggle, toggleFilterV
 
 BrowseProviderView.propTypes = {
   providers: PropTypes.array.isRequired,
+  handleFilterToggle: PropTypes.func,
+  toggleFilterValue: PropTypes.bool,
 };
 
 export default CSSModules(BrowseProviderView, styles);
diff --git a/src/routes/BrowseProvider/components/ProviderMap/ProviderMap.jsx b/src/routes/BrowseProvider/components/ProviderMap/ProviderMap.jsx
index 470ab9b..18cc1f4 100644
--- a/src/routes/BrowseProvider/components/ProviderMap/ProviderMap.jsx
+++ b/src/routes/BrowseProvider/components/ProviderMap/ProviderMap.jsx
@@ -1,4 +1,6 @@
-import React, { PropTypes } from 'react';
+/* eslint no-console: 0 */
+
+import React from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './ProviderMap.scss';
 
@@ -8,7 +10,7 @@ const getImage = (name) => `${window.location.origin}/img/${name}`;
    * The MapTypeCtrl adds map type to roadmap
    * This constructor takes the control DIV as an argument.
    */
-function RoadTypeCtrl(controlDiv, map, type) {
+function RoadTypeCtrl(controlDiv, map) {
     // Set CSS for the control border.
   const controlUI = document.createElement('div');
   controlUI.id = 'roadMap';
@@ -32,8 +34,8 @@ function RoadTypeCtrl(controlDiv, map, type) {
 
     // Setup the click event listeners: simply set the map to Chicago.
   controlUI.addEventListener('click', () => {
-    if (map.getMapTypeId() != 'roadmap') {
-      new SatelliteTypeCtrl(document.createElement('div'), map, 'roadmap');
+    if (map.getMapTypeId() !== 'roadmap') {
+      SatelliteTypeCtrl(document.createElement('div'), map, 'roadmap');
       document.getElementById('satMap').style.backgroundColor = '#fff';
       document.getElementById('satMap').style.border = '1px solid #d7d7d7';
       document.getElementById('satMapText').style.color = '#383838';
@@ -50,7 +52,7 @@ function RoadTypeCtrl(controlDiv, map, type) {
    * The SatelliteTypeCtrl adds map type to Satellite
    * This constructor takes the control DIV as an argument.
    */
-function SatelliteTypeCtrl(controlDiv, map, type) {
+function SatelliteTypeCtrl(controlDiv, map) {
     // Set CSS for the control border.
   const controlUI = document.createElement('div');
   controlUI.id = 'satMap';
@@ -74,8 +76,8 @@ function SatelliteTypeCtrl(controlDiv, map, type) {
 
     // Setup the click event listeners: simply set the map to Chicago.
   controlUI.addEventListener('click', () => {
-    if (map.getMapTypeId() != 'satellite') {
-      const roadUI = new RoadTypeCtrl(document.createElement('div'), map, 'satellite');
+    if (map.getMapTypeId() !== 'satellite') {
+      RoadTypeCtrl(document.createElement('div'), map, 'satellite');
       document.getElementById('roadMap').style.backgroundColor = '#fff';
       document.getElementById('roadMap').style.border = '1px solid #d7d7d7';
       document.getElementById('roadMapText').style.color = '#383838';
@@ -91,7 +93,7 @@ function SatelliteTypeCtrl(controlDiv, map, type) {
    * The movedMapCtrl adds map type to Satellite
    * This constructor takes the control DIV as an argument.
    */
-function movedMapCtrl(controlDiv, map, type) {
+function movedMapCtrl(controlDiv, map) {
     // Set CSS for the control border.
   const controlUI = document.createElement('div');
   controlUI.id = 'movMap';
@@ -109,7 +111,6 @@ function movedMapCtrl(controlDiv, map, type) {
 
     // Setup the click event listeners: simply set the map to Chicago.
   controlUI.addEventListener('click', () => {
-    console.log(document.getElementById('searchCheckbox').checked);
     if (document.getElementById('searchCheckbox').checked) {
         // Listener map move
       map.addListener('dragstart', () => {
@@ -172,10 +173,10 @@ class ProviderMap extends React.Component {
           lng: position.coords.longitude,
         };
         // generate random markers arround current location
-        for (var i = 4; i >= 0; i--) {
+        for (let i = 4; i >= 0; i--) {
           createMarker(generatePos(pos, 0.02), getImage('icon-provider-drone.png'), _self.map);
         }
-        for (var i = 4; i >= 0; i--) {
+        for (let i = 4; i >= 0; i--) {
           createMarker(generatePos(pos, -0.038), getImage('icon-provider-drone.png'), _self.map);
         }
 
@@ -193,21 +194,21 @@ class ProviderMap extends React.Component {
 
     // Create the DIV to hold the control and call the RoadTypeCtrl()
     const roadTypeCtrlDiv = document.createElement('div');
-    const roadTypeCtrl = new RoadTypeCtrl(roadTypeCtrlDiv, this.map, 'roadmap');
+    RoadTypeCtrl(roadTypeCtrlDiv, this.map, 'roadmap');
 
     roadTypeCtrlDiv.index = 1;
     this.map.controls[google.maps.ControlPosition.BOTTOM_CENTER].push(roadTypeCtrlDiv);
 
     // Create the DIV to hold the control and call the SatelliteTypeCtrl()
     const smapTypeCtrlDiv = document.createElement('div');
-    const smapTypeCtrl = new SatelliteTypeCtrl(smapTypeCtrlDiv, this.map, 'satellite');
+    SatelliteTypeCtrl(smapTypeCtrlDiv, this.map, 'satellite');
 
     smapTypeCtrlDiv.index = 1;
     this.map.controls[google.maps.ControlPosition.BOTTOM_CENTER].push(smapTypeCtrlDiv);
 
     // Create the DIV to hold the control and call the movedMapCtrl()
     const moveCtrlDiv = document.createElement('div');
-    const moveCtrl = new movedMapCtrl(moveCtrlDiv, this.map, 'satellite');
+    movedMapCtrl(moveCtrlDiv, this.map, 'satellite');
 
     moveCtrlDiv.index = 1;
     this.map.controls[google.maps.ControlPosition.LEFT_BOTTOM].push(moveCtrlDiv);
@@ -216,9 +217,9 @@ class ProviderMap extends React.Component {
       const errorMsg = (browserHasGeolocation ?
                             'Error: The Geolocation service failed.' :
                             'Error: Your browser doesn\'t support geolocation.');
-      console.log(errorMsg);
+      console.error(errorMsg);
     }
-    const prv = 0;
+
     // create marker
     function createMarker(pos, icon, map) {
       const marker = new google.maps.Marker({
@@ -226,8 +227,8 @@ class ProviderMap extends React.Component {
         position: pos,
         map,
       });
-      marker.addListener('click', function () {
-        infowindow.open(this.map, marker);
+      marker.addListener('click', () => {
+        infowindow.open(map, marker);
       });
 
       return marker;
@@ -244,11 +245,11 @@ class ProviderMap extends React.Component {
       return {lat, lng};
     }
     function getRandomInRange(from, to, fixed) {
-      return (Math.random() * (to - from) + from).toFixed(fixed) * 1;
+      return Number((Math.random() * (to - from) + from).toFixed(fixed));
     }
   }
 
-  shouldComponentUpdate() {
+  shouldComponentUpdate() { // eslint-disable-line lodash/prefer-constant
     // the whole logic is handled by google plugin
     return false;
   }
diff --git a/src/routes/BrowseProvider/components/ProvidersFilter/ProvidersFilter.jsx b/src/routes/BrowseProvider/components/ProvidersFilter/ProvidersFilter.jsx
index daa0599..56eb2f9 100644
--- a/src/routes/BrowseProvider/components/ProvidersFilter/ProvidersFilter.jsx
+++ b/src/routes/BrowseProvider/components/ProvidersFilter/ProvidersFilter.jsx
@@ -1,6 +1,5 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import Select from 'react-select';
 import Dropdown from 'react-dropdown';
 import InputRange from 'react-input-range';
 import {Radio, RadioGroup} from 'react-icheck';
@@ -8,18 +7,13 @@ import cn from 'classnames';
 import Button from 'components/Button';
 import styles from './ProvidersFilter.scss';
 
-const getImage = (name) => `${window.location.origin}/img/drones/${name}`;
-
 const options = [
-  { value: 1, label: 'Any categories' },
-  { value: 2, label: 'Category one' },
-  { value: 3, label: 'Category two' },
+  {value: 1, label: 'Any categories'},
+  {value: 2, label: 'Category one'},
+  {value: 3, label: 'Category two'},
 ];
 
 const defaultOption = options[0];
-function onChange(val) {
-  console.log(val.value);
-}
 
 
 class ProvidersFilter extends React.Component {
@@ -51,7 +45,7 @@ class ProvidersFilter extends React.Component {
   }
   toggleHidden() {
     this.setState({
-      isHidden: this.state.isHidden ? false : true,
+      isHidden: !this.state.isHidden,
     });
   }
   selectHourRent(index) {
@@ -75,7 +69,6 @@ class ProvidersFilter extends React.Component {
               <div styleName="category-dropdown">
                 <Dropdown
                   options={options}
-                  onChange={onChange}
                   value={defaultOption}
                   placeholder=""
                 />
@@ -170,7 +163,7 @@ class ProvidersFilter extends React.Component {
           </div>
           {/* carry weight row end */}
           <div styleName="actions">
-            <Button color="gray" className={styles.btnMargin} onClick={(e) => this.props.handleFilterToggle(!this.props.toggleFilterValue)}>Cancel</Button>
+            <Button color="gray" className={styles.btnMargin} onClick={() => this.props.handleFilterToggle(!this.props.toggleFilterValue)}>Cancel</Button>
             <Button type="submit" color="blue">Filter</Button>
           </div>
         </div>
@@ -181,6 +174,8 @@ class ProvidersFilter extends React.Component {
 
 
 ProvidersFilter.propTypes = {
+  handleFilterToggle: PropTypes.func.isRequired,
+  toggleFilterValue: PropTypes.bool,
 };
 
 export default CSSModules(ProvidersFilter, styles);
diff --git a/src/routes/BrowseProvider/components/ProvidersGrid/ProvidersGrid.jsx b/src/routes/BrowseProvider/components/ProvidersGrid/ProvidersGrid.jsx
index f77b7c2..43497fa 100644
--- a/src/routes/BrowseProvider/components/ProvidersGrid/ProvidersGrid.jsx
+++ b/src/routes/BrowseProvider/components/ProvidersGrid/ProvidersGrid.jsx
@@ -1,24 +1,20 @@
-import React, { PropTypes, Component } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './ProvidersGrid.scss';
 import ProvidersGridItem from '../ProvidersGridItem';
 
-class ProvidersGrid extends Component {
-  render() {
-    return (
-      <div styleName="popular-drones-slides">
+const ProvidersGrid = (props) => (
+  <div styleName="popular-drones-slides">
 
-        <div styleName="drones-slides" className="drones-slides">
-          {
-            this.props.providers.map((drone, i) => (
-              <div key={i}><ProvidersGridItem droneInfo={drone} /></div>
-            ))
-          }
-        </div>
-      </div>
-    );
-  }
-}
+    <div styleName="drones-slides" className="drones-slides">
+      {
+        props.providers.map((drone, i) => (
+          <div key={i}><ProvidersGridItem droneInfo={drone} /></div>
+        ))
+      }
+    </div>
+  </div>
+);
 
 ProvidersGrid.propTypes = {
   providers: PropTypes.array.isRequired,
diff --git a/src/routes/BrowseProvider/components/ProvidersGridItem/ProvidersGridItem.jsx b/src/routes/BrowseProvider/components/ProvidersGridItem/ProvidersGridItem.jsx
index 8919a6d..8d49c22 100644
--- a/src/routes/BrowseProvider/components/ProvidersGridItem/ProvidersGridItem.jsx
+++ b/src/routes/BrowseProvider/components/ProvidersGridItem/ProvidersGridItem.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './ProvidersGridItem.scss';
 import ProvidersGridTooltips from '../ProvidersGridTooltips';
@@ -6,9 +6,6 @@ import ProvidersGridTooltips from '../ProvidersGridTooltips';
 const getImage = (name) => `${window.location.origin}/img/drones/${name}`;
 
 class ProvidersGridItem extends React.Component {
-  componentDidMount() {
-    const { droneInfo } = this.props;
-  }
   constructor() {
     super();
     this.state = {
@@ -18,7 +15,7 @@ class ProvidersGridItem extends React.Component {
 
   toggleHidden() {
     this.setState({
-      isHidden: this.state.isHidden ? false : true,
+      isHidden: !this.state.isHidden,
     });
   }
 
diff --git a/src/routes/BrowseProvider/components/ProvidersGridTooltips/ProvidersGridTooltips.jsx b/src/routes/BrowseProvider/components/ProvidersGridTooltips/ProvidersGridTooltips.jsx
index dbf875b..59a1074 100644
--- a/src/routes/BrowseProvider/components/ProvidersGridTooltips/ProvidersGridTooltips.jsx
+++ b/src/routes/BrowseProvider/components/ProvidersGridTooltips/ProvidersGridTooltips.jsx
@@ -1,14 +1,9 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import enhanceWithClickOutside from 'react-click-outside';
 import styles from './ProvidersGridTooltips.scss';
 
-const getImage = (name) => `${window.location.origin}/img/drones/${name}`;
-
 class ProvidersGridTooltips extends React.Component {
-  componentDidMount() {
-    const { droneInfo } = this.props;
-  }
   constructor() {
     super();
     this.state = {
@@ -16,11 +11,11 @@ class ProvidersGridTooltips extends React.Component {
     };
   }
   handleClickOutside() {
-    this.setState({ isHidden: true });
+    this.setState({isHidden: true});
   }
   toggleHidden() {
     this.setState({
-      isHidden: this.state.isHidden ? false : true,
+      isHidden: !this.state.isHidden,
     });
   }
 
diff --git a/src/routes/BrowseProvider/containers/BrowseProviderContainer.js b/src/routes/BrowseProvider/containers/BrowseProviderContainer.js
index a236262..2a2852e 100644
--- a/src/routes/BrowseProvider/containers/BrowseProviderContainer.js
+++ b/src/routes/BrowseProvider/containers/BrowseProviderContainer.js
@@ -1,5 +1,5 @@
-import { asyncConnect } from 'redux-connect';
-import { actions, toggleFilter } from '../modules/BrowseProvider';
+import {asyncConnect} from 'redux-connect';
+import {toggleFilter} from '../modules/BrowseProvider';
 
 import BrowseProviderView from '../components/BrowseProviderView';
 
diff --git a/src/routes/BrowseProvider/containers/ProviderMapContainer.js b/src/routes/BrowseProvider/containers/ProviderMapContainer.js
index d2fa604..cc64e5d 100644
--- a/src/routes/BrowseProvider/containers/ProviderMapContainer.js
+++ b/src/routes/BrowseProvider/containers/ProviderMapContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import ProviderMap from '../components/ProviderMap';
 
 const mapState = (state) => state.browseProvider;
diff --git a/src/routes/BrowseProvider/index.js b/src/routes/BrowseProvider/index.js
index 373479b..89a4035 100644
--- a/src/routes/BrowseProvider/index.js
+++ b/src/routes/BrowseProvider/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'browse-provider',
@@ -9,7 +9,7 @@ export default (store) => ({
       const BrowseProvider = require('./containers/BrowseProviderContainer').default;
       const reducer = require('./modules/BrowseProvider').default;
 
-      injectReducer(store, { key: 'browseProvider', reducer });
+      injectReducer(store, {key: 'browseProvider', reducer});
       cb(null, BrowseProvider);
     }, 'BrowseProvider');
   },
diff --git a/src/routes/BrowseProvider/modules/BrowseProvider.js b/src/routes/BrowseProvider/modules/BrowseProvider.js
index 90f80c1..26fb8c7 100644
--- a/src/routes/BrowseProvider/modules/BrowseProvider.js
+++ b/src/routes/BrowseProvider/modules/BrowseProvider.js
@@ -1,4 +1,4 @@
-import { handleActions, createAction } from 'redux-actions';
+import {handleActions, createAction} from 'redux-actions';
 
 // ------------------------------------
 // Actions
@@ -26,13 +26,13 @@ export default handleActions({
 }, {
   // initial data
   providers: [
-  	{imgSrc: 'drone-1.png', droneName: 'Drone Maniac', completedJob: 21, sponsored: true, hasBadge: true},
-  	{imgSrc: 'drone-2.png', droneName: 'Pro Flying', completedJob: 20, sponsored: false, hasBadge: true},
-  	{imgSrc: 'drone-3.png', droneName: 'XtremeDrone', completedJob: 21, sponsored: false, hasBadge: true},
-  	{imgSrc: 'drone-4.png', droneName: 'Drone Maniac', completedJob: 11, sponsored: false, hasBadge: true},
-  	{imgSrc: 'drone-3.png', droneName: 'XtremeDrone', completedJob: 21, sponsored: false, hasBadge: true},
-  	{imgSrc: 'drone-2.png', droneName: 'Pro Flying', completedJob: 31, sponsored: false, hasBadge: true},
-  	{imgSrc: 'drone-1.png', droneName: 'Drone Maniac', completedJob: 25, sponsored: false, hasBadge: true},
+    {imgSrc: 'drone-1.png', droneName: 'Drone Maniac', completedJob: 21, sponsored: true, hasBadge: true},
+    {imgSrc: 'drone-2.png', droneName: 'Pro Flying', completedJob: 20, sponsored: false, hasBadge: true},
+    {imgSrc: 'drone-3.png', droneName: 'XtremeDrone', completedJob: 21, sponsored: false, hasBadge: true},
+    {imgSrc: 'drone-4.png', droneName: 'Drone Maniac', completedJob: 11, sponsored: false, hasBadge: true},
+    {imgSrc: 'drone-3.png', droneName: 'XtremeDrone', completedJob: 21, sponsored: false, hasBadge: true},
+    {imgSrc: 'drone-2.png', droneName: 'Pro Flying', completedJob: 31, sponsored: false, hasBadge: true},
+    {imgSrc: 'drone-1.png', droneName: 'Drone Maniac', completedJob: 25, sponsored: false, hasBadge: true},
     {imgSrc: 'drone-1.png', droneName: 'XtremeDrone', completedJob: 22, sponsored: true, hasBadge: true},
     {imgSrc: 'drone-2.png', droneName: 'Drone Maniac', completedJob: 21, sponsored: false, hasBadge: true},
     {imgSrc: 'drone-3.png', droneName: 'Pro Flying', completedJob: 21, sponsored: false, hasBadge: true},
diff --git a/src/routes/Dashboard/components/DashboardRequest/DashboardRequest.jsx b/src/routes/Dashboard/components/DashboardRequest/DashboardRequest.jsx
index a00905e..921af67 100644
--- a/src/routes/Dashboard/components/DashboardRequest/DashboardRequest.jsx
+++ b/src/routes/Dashboard/components/DashboardRequest/DashboardRequest.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import moment from 'moment';
 import Pagination from 'components/Pagination';
diff --git a/src/routes/Dashboard/components/DashboardStatus/DashboardStatus.jsx b/src/routes/Dashboard/components/DashboardStatus/DashboardStatus.jsx
index 001e701..fc99793 100644
--- a/src/routes/Dashboard/components/DashboardStatus/DashboardStatus.jsx
+++ b/src/routes/Dashboard/components/DashboardStatus/DashboardStatus.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './DashboardStatus.scss';
 
diff --git a/src/routes/Dashboard/components/NotificationBox/NotificationBox.jsx b/src/routes/Dashboard/components/NotificationBox/NotificationBox.jsx
index fa3ee81..1aae7cb 100644
--- a/src/routes/Dashboard/components/NotificationBox/NotificationBox.jsx
+++ b/src/routes/Dashboard/components/NotificationBox/NotificationBox.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './NotificationBox.scss';
 
diff --git a/src/routes/Dashboard/containers/DashboardContainer.js b/src/routes/Dashboard/containers/DashboardContainer.js
index 792f700..d6759c4 100644
--- a/src/routes/Dashboard/containers/DashboardContainer.js
+++ b/src/routes/Dashboard/containers/DashboardContainer.js
@@ -1,4 +1,4 @@
-import { asyncConnect } from 'redux-connect';
+import {asyncConnect} from 'redux-connect';
 import {actions} from '../modules/Dashboard';
 
 import DashboardView from '../components/DashboardView';
diff --git a/src/routes/Dashboard/index.js b/src/routes/Dashboard/index.js
index 1b20b12..a7460e1 100644
--- a/src/routes/Dashboard/index.js
+++ b/src/routes/Dashboard/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'dashboard',
@@ -9,7 +9,7 @@ export default (store) => ({
       const Dashboard = require('./containers/DashboardContainer').default;
       const reducer = require('./modules/Dashboard').default;
 
-      injectReducer(store, { key: 'dashboard', reducer });
+      injectReducer(store, {key: 'dashboard', reducer});
       cb(null, Dashboard);
     }, 'Dashboard');
   },
diff --git a/src/routes/Dashboard/modules/Dashboard.js b/src/routes/Dashboard/modules/Dashboard.js
index 96d0824..de0f583 100644
--- a/src/routes/Dashboard/modules/Dashboard.js
+++ b/src/routes/Dashboard/modules/Dashboard.js
@@ -1,4 +1,4 @@
-import { handleActions } from 'redux-actions';
+import {handleActions} from 'redux-actions';
 
 // ------------------------------------
 // Actions
diff --git a/src/routes/DroneDetails/components/BrowseServices/BrowseServices.jsx b/src/routes/DroneDetails/components/BrowseServices/BrowseServices.jsx
index 4f6aff3..9f83c83 100644
--- a/src/routes/DroneDetails/components/BrowseServices/BrowseServices.jsx
+++ b/src/routes/DroneDetails/components/BrowseServices/BrowseServices.jsx
@@ -1,31 +1,20 @@
-import React, { PropTypes, Component } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './BrowseServices.scss';
 import BrowseServicesItem from '../BrowseServicesItem';
 
-class BrowseServices extends Component {
-  constructor(props) {
-    super(props);
-  }
-  render() {
-    return (
-      <div styleName="browse-services">
-
-        <div styleName="header">Services</div>
-
-        <div styleName="browse-services-items">
-          {
-
-            this.props.categories.map((category, i) => (
-              <div key={i}><BrowseServicesItem category={category} /></div>
-            ))
-          }
-
-        </div>
-      </div>
-    );
-  }
-}
+const BrowseServices = (props) => (
+  <div styleName="browse-services">
+    <div styleName="header">Services</div>
+    <div styleName="browse-services-items">
+      {
+        props.categories.map((category, i) => (
+          <div key={i}><BrowseServicesItem category={category} /></div>
+        ))
+      }
+    </div>
+  </div>
+);
 
 BrowseServices.propTypes = {
   categories: PropTypes.array.isRequired,
diff --git a/src/routes/DroneDetails/components/BrowseServicesItem/BrowseServicesItem.jsx b/src/routes/DroneDetails/components/BrowseServicesItem/BrowseServicesItem.jsx
index 39ea65b..514dd27 100644
--- a/src/routes/DroneDetails/components/BrowseServicesItem/BrowseServicesItem.jsx
+++ b/src/routes/DroneDetails/components/BrowseServicesItem/BrowseServicesItem.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './BrowseServicesItem.scss';
 
diff --git a/src/routes/DroneDetails/components/DroneDetailBanner/DroneDetailBanner.jsx b/src/routes/DroneDetails/components/DroneDetailBanner/DroneDetailBanner.jsx
index 779f43e..84badcf 100644
--- a/src/routes/DroneDetails/components/DroneDetailBanner/DroneDetailBanner.jsx
+++ b/src/routes/DroneDetails/components/DroneDetailBanner/DroneDetailBanner.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './DroneDetailBanner.scss';
 
@@ -7,7 +7,7 @@ const getImage = (name) => `${window.location.origin}/img/drones/${name}`;
 /*
 * DroneDetailBanner
 */
-export const DroneDetailBanner = ({}) => (
+export const DroneDetailBanner = () => (
   <div styleName="drone-detail-banner">
     <ul>
       <li>
diff --git a/src/routes/DroneDetails/components/DroneDetailsHeader/DroneDetailsHeader.jsx b/src/routes/DroneDetails/components/DroneDetailsHeader/DroneDetailsHeader.jsx
index 7921b5b..2f5aac7 100644
--- a/src/routes/DroneDetails/components/DroneDetailsHeader/DroneDetailsHeader.jsx
+++ b/src/routes/DroneDetails/components/DroneDetailsHeader/DroneDetailsHeader.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import CSSModules from 'react-css-modules';
-import { Link } from 'react-router';
+import {Link} from 'react-router';
 import Button from 'components/Button';
 import styles from './DroneDetailsHeader.scss';
 
diff --git a/src/routes/DroneDetails/components/DroneDetailsTabs/DroneDetailsTabs.jsx b/src/routes/DroneDetails/components/DroneDetailsTabs/DroneDetailsTabs.jsx
index bbde986..7ac2daf 100644
--- a/src/routes/DroneDetails/components/DroneDetailsTabs/DroneDetailsTabs.jsx
+++ b/src/routes/DroneDetails/components/DroneDetailsTabs/DroneDetailsTabs.jsx
@@ -1,6 +1,6 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import { Tab, Tabs, TabList, TabPanel } from 'react-tabs';
+import {Tab, Tabs, TabList, TabPanel} from 'react-tabs';
 import DroneInfoDetails from '../DroneInfoDetails';
 import DroneScheduleCalendar from '../DroneScheduleCalendar';
 import DroneScheduleTableContainer from '../../containers/DroneScheduleTableContainer';
diff --git a/src/routes/DroneDetails/components/DroneDetailsView.jsx b/src/routes/DroneDetails/components/DroneDetailsView.jsx
index 8d43c3e..176ea37 100644
--- a/src/routes/DroneDetails/components/DroneDetailsView.jsx
+++ b/src/routes/DroneDetails/components/DroneDetailsView.jsx
@@ -26,6 +26,7 @@ export const DroneDetailsView = ({categories, feedbacks}) => (
 
 DroneDetailsView.propTypes = {
   categories: PropTypes.array.isRequired,
+  feedbacks: PropTypes.array,
 };
 
 export default CSSModules(DroneDetailsView, styles);
diff --git a/src/routes/DroneDetails/components/DroneInfoDetails/DroneInfoDetails.jsx b/src/routes/DroneDetails/components/DroneInfoDetails/DroneInfoDetails.jsx
index 87f8d1b..7f7a424 100644
--- a/src/routes/DroneDetails/components/DroneInfoDetails/DroneInfoDetails.jsx
+++ b/src/routes/DroneDetails/components/DroneInfoDetails/DroneInfoDetails.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './DroneInfoDetails.scss';
 
@@ -7,7 +7,7 @@ const getImage = (name) => `${window.location.origin}/img/drones/${name}`;
 /*
 * DroneInfoDetails
 */
-export const DroneInfoDetails = ({}) => (
+export const DroneInfoDetails = () => (
   <div styleName="drone-info-details">
     <img src={getImage('drone-lg.png')} alt="drone picture" />
     <div styleName="drone-info">
diff --git a/src/routes/DroneDetails/components/DroneInfoSpecification/DroneInfoSpecification.jsx b/src/routes/DroneDetails/components/DroneInfoSpecification/DroneInfoSpecification.jsx
index ee3d7fe..0335811 100644
--- a/src/routes/DroneDetails/components/DroneInfoSpecification/DroneInfoSpecification.jsx
+++ b/src/routes/DroneDetails/components/DroneInfoSpecification/DroneInfoSpecification.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './DroneInfoSpecification.scss';
 
@@ -7,7 +7,7 @@ const getImage = (name) => `${window.location.origin}/img/drones/${name}`;
 /*
 * DroneDetailsTabs
 */
-export const DroneInfoSpecification = ({}) => (
+export const DroneInfoSpecification = () => (
   <div styleName="drone-info-spec ">
     <div styleName="left-col">
       <img src={getImage('drone-spec.png')} alt="drone picture" />
diff --git a/src/routes/DroneDetails/components/DroneScheduleCalendar/DroneScheduleCalendar.jsx b/src/routes/DroneDetails/components/DroneScheduleCalendar/DroneScheduleCalendar.jsx
index 6421ceb..87c14e5 100644
--- a/src/routes/DroneDetails/components/DroneScheduleCalendar/DroneScheduleCalendar.jsx
+++ b/src/routes/DroneDetails/components/DroneScheduleCalendar/DroneScheduleCalendar.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import moment from 'moment';
 import Calendar from 'rc-calendar';
@@ -13,8 +13,6 @@ const defaultCalendarValue = now;
 const format = 'dddd, MMMM DD, YYYY';
 
 class DroneScheduleCalendar extends React.Component {
-  componentDidMount() {
-  }
   onStandaloneSelect(value) {
     this.props.selectedDateHandle(value.format(format));
   }
diff --git a/src/routes/DroneDetails/components/DroneScheduleTable/DroneScheduleTable.jsx b/src/routes/DroneDetails/components/DroneScheduleTable/DroneScheduleTable.jsx
index fbb178e..04654e0 100644
--- a/src/routes/DroneDetails/components/DroneScheduleTable/DroneScheduleTable.jsx
+++ b/src/routes/DroneDetails/components/DroneScheduleTable/DroneScheduleTable.jsx
@@ -1,6 +1,6 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import Reactable from 'Reactable';
+import Reactable from 'reactable';
 import styles from './DroneScheduleTable.scss';
 
 const Table = Reactable.Table;
diff --git a/src/routes/DroneDetails/components/Feedback/Feedback.jsx b/src/routes/DroneDetails/components/Feedback/Feedback.jsx
index f6bece0..c5e904a 100644
--- a/src/routes/DroneDetails/components/Feedback/Feedback.jsx
+++ b/src/routes/DroneDetails/components/Feedback/Feedback.jsx
@@ -1,51 +1,40 @@
-import React, { PropTypes, Component } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import Dropdown from 'react-dropdown';
 import styles from './Feedback.scss';
 import FeedbackItem from '../FeedbackItem';
 
 const options = [
-  { value: 1, label: 'Show 10 reviews' },
-  { value: 2, label: 'Show 20 reviews' },
-  { value: 3, label: 'Show all reviews' },
+  {value: 1, label: 'Show 10 reviews'},
+  {value: 2, label: 'Show 20 reviews'},
+  {value: 3, label: 'Show all reviews'},
 ];
 
 const defaultOption = options[2];
-function onChange(val) {
-  console.log(val.value);
-}
 
-class Feedback extends Component {
-  constructor(props) {
-    super(props);
-  }
-  render() {
-    return (
-      <div styleName="feedback-section">
-        <div styleName="feedback-header">
-          <p>Feedback</p>
-          <div styleName="see-reviews-option">
+const Feedback = (props) => (
+  <div styleName="feedback-section">
+    <div styleName="feedback-header">
+      <p>Feedback</p>
+      <div styleName="see-reviews-option">
 
-            <Dropdown
-              options={options}
-              onChange={onChange}
-              value={defaultOption}
-              placeholder=""
-            />
-          </div>
-        </div>
-
-        <div styleName="feedback-items">
-          {
-            this.props.feedbacks.map((feedback, i) => (
-              <div key={i}><FeedbackItem feedback={feedback} /></div>
-            ))
-          }
-        </div>
+        <Dropdown
+          options={options}
+          value={defaultOption}
+          placeholder=""
+        />
       </div>
-    );
-  }
-}
+    </div>
+
+    <div styleName="feedback-items">
+      {
+        props.feedbacks.map((feedback, i) => (
+          <div key={i}><FeedbackItem feedback={feedback} /></div>
+        ))
+      }
+    </div>
+  </div>
+);
 
 Feedback.propTypes = {
   feedbacks: PropTypes.array.isRequired,
diff --git a/src/routes/DroneDetails/components/FeedbackItem/FeedbackItem.jsx b/src/routes/DroneDetails/components/FeedbackItem/FeedbackItem.jsx
index e57317a..d6d2966 100644
--- a/src/routes/DroneDetails/components/FeedbackItem/FeedbackItem.jsx
+++ b/src/routes/DroneDetails/components/FeedbackItem/FeedbackItem.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './FeedbackItem.scss';
 
diff --git a/src/routes/DroneDetails/components/FeedbackItem/index.js b/src/routes/DroneDetails/components/FeedbackItem/index.js
index 6c7296f..5b1fc1c 100644
--- a/src/routes/DroneDetails/components/FeedbackItem/index.js
+++ b/src/routes/DroneDetails/components/FeedbackItem/index.js
@@ -1,3 +1,3 @@
-import feedbackItem from './feedbackItem';
+import FeedbackItem from './FeedbackItem';
 
-export default feedbackItem;
+export default FeedbackItem;
diff --git a/src/routes/DroneDetails/components/LastCompletedMissions/LastCompletedMissions.jsx b/src/routes/DroneDetails/components/LastCompletedMissions/LastCompletedMissions.jsx
index b78dbb3..ad63b24 100644
--- a/src/routes/DroneDetails/components/LastCompletedMissions/LastCompletedMissions.jsx
+++ b/src/routes/DroneDetails/components/LastCompletedMissions/LastCompletedMissions.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import LastCompletedMissionsItem from '../LastCompletedMissionsItem';
 import styles from './LastCompletedMissions.scss';
diff --git a/src/routes/DroneDetails/components/LastCompletedMissionsItem/LastCompletedMissionsItem.jsx b/src/routes/DroneDetails/components/LastCompletedMissionsItem/LastCompletedMissionsItem.jsx
index 90bb72b..eb086de 100644
--- a/src/routes/DroneDetails/components/LastCompletedMissionsItem/LastCompletedMissionsItem.jsx
+++ b/src/routes/DroneDetails/components/LastCompletedMissionsItem/LastCompletedMissionsItem.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './LastCompletedMissionsItem.scss';
 
diff --git a/src/routes/DroneDetails/containers/DroneDetailsContainer.js b/src/routes/DroneDetails/containers/DroneDetailsContainer.js
index 6e0c13a..1845440 100644
--- a/src/routes/DroneDetails/containers/DroneDetailsContainer.js
+++ b/src/routes/DroneDetails/containers/DroneDetailsContainer.js
@@ -1,4 +1,4 @@
-import { asyncConnect } from 'redux-connect';
+import {asyncConnect} from 'redux-connect';
 import {actions} from '../modules/DroneDetails';
 
 import DroneDetailsView from '../components/DroneDetailsView';
diff --git a/src/routes/DroneDetails/containers/DroneDetailsTabsContainer.js b/src/routes/DroneDetails/containers/DroneDetailsTabsContainer.js
index 44f06da..f4ddece 100644
--- a/src/routes/DroneDetails/containers/DroneDetailsTabsContainer.js
+++ b/src/routes/DroneDetails/containers/DroneDetailsTabsContainer.js
@@ -1,6 +1,6 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import DroneDetailsTabs from '../components/DroneDetailsTabs';
-import { selectedDate } from '../modules/DroneDetails';
+import {selectedDate} from '../modules/DroneDetails';
 
 const mapState = (state) => state.droneDetails;
 
diff --git a/src/routes/DroneDetails/containers/DroneScheduleTableContainer.js b/src/routes/DroneDetails/containers/DroneScheduleTableContainer.js
index f8cf304..4d029e8 100644
--- a/src/routes/DroneDetails/containers/DroneScheduleTableContainer.js
+++ b/src/routes/DroneDetails/containers/DroneScheduleTableContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import DroneScheduleTable from '../components/DroneScheduleTable';
 
 const mapState = (state) => state.droneDetails;
diff --git a/src/routes/DroneDetails/index.js b/src/routes/DroneDetails/index.js
index 245be84..ae49428 100644
--- a/src/routes/DroneDetails/index.js
+++ b/src/routes/DroneDetails/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'drone-details',
@@ -8,7 +8,7 @@ export default (store) => ({
       const DroneDetails = require('./containers/DroneDetailsContainer').default;
       const reducer = require('./modules/DroneDetails').default;
 
-      injectReducer(store, { key: 'droneDetails', reducer });
+      injectReducer(store, {key: 'droneDetails', reducer});
       cb(null, DroneDetails);
     }, 'DroneDetails');
   },
diff --git a/src/routes/DroneDetails/modules/DroneDetails.js b/src/routes/DroneDetails/modules/DroneDetails.js
index 84a8896..47db370 100644
--- a/src/routes/DroneDetails/modules/DroneDetails.js
+++ b/src/routes/DroneDetails/modules/DroneDetails.js
@@ -1,4 +1,4 @@
-import { handleActions } from 'redux-actions';
+import {handleActions} from 'redux-actions';
 
 
 // ------------------------------------
@@ -12,40 +12,69 @@ export const sendRequest = (values) => new Promise((resolve) => {
 });
 
 
-export const actions = {
-};
+export const actions = {};
 
 // ------------------------------------
 // Reducer
 // ------------------------------------
-export default handleActions({
-
-}, {
+export default handleActions({}, {
   // initial data
   categories: [
     {categoryImgSrc: 'delivery-category-pic.png', categoryName: 'Delivery', iconName: 'icon-delivery-category'},
     {categoryImgSrc: 'mapping-category-pic.png', categoryName: 'Mapping', iconName: 'icon-mapping-category'},
     {categoryImgSrc: 'monitoring-category-pic.png', categoryName: 'Monitoring', iconName: 'icon-monitoring-category'},
-    {categoryImgSrc: 'photography-category-pic.png', categoryName: 'Photography', iconName: 'icon-photography-category'},
+    {
+      categoryImgSrc: 'photography-category-pic.png',
+      categoryName: 'Photography',
+      iconName: 'icon-photography-category',
+    },
     {categoryImgSrc: 'filming-category-pic.png', categoryName: 'Filming', iconName: 'icon-filming-category'},
-    {categoryImgSrc: 'construction-category-pic.png', categoryName: 'Construction', iconName: 'icon-construction-category'},
+    {
+      categoryImgSrc: 'construction-category-pic.png',
+      categoryName: 'Construction',
+      iconName: 'icon-construction-category',
+    },
     {categoryImgSrc: 'delivery-category-pic.png', categoryName: 'Delivery', iconName: 'icon-delivery-category'},
     {categoryImgSrc: 'mapping-category-pic.png', categoryName: 'Mapping', iconName: 'icon-mapping-category'},
     {categoryImgSrc: 'monitoring-category-pic.png', categoryName: 'Monitoring', iconName: 'icon-monitoring-category'},
-    {categoryImgSrc: 'photography-category-pic.png', categoryName: 'Photography', iconName: 'icon-photography-category'},
+    {
+      categoryImgSrc: 'photography-category-pic.png',
+      categoryName: 'Photography',
+      iconName: 'icon-photography-category',
+    },
   ],
 
   feedbacks: [
-    {avatarImgSrc: 'avatar-1.png', name: 'Selina Gomez', time: '5 minutes ago',
-      comment: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinartempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio. Lorem ipsum dolor sit amet, consectetur adipiscing elit. '},
-    {avatarImgSrc: 'avatar-2.png', name: 'Chris Evan', time: '5 minutes ago',
-      comment: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinartempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio. Lorem ipsum dolor sit amet, consectetur adipiscing elit. '},
-    {avatarImgSrc: 'avatar-3.png', name: 'Chris Brown', time: '5 minutes ago',
-      comment: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinartempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio. Lorem ipsum dolor sit amet, consectetur adipiscing elit. '},
-    {avatarImgSrc: 'avatar-4.png', name: 'Taylor Swift', time: '5 minutes ago',
-      comment: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinartempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio. Lorem ipsum dolor sit amet, consectetur adipiscing elit. '},
-    {avatarImgSrc: 'avatar-5.png', name: 'elly Chen', time: '5 minutes ago',
-      comment: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinartempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio. Lorem ipsum dolor sit amet, consectetur adipiscing elit. '},
+    {
+      avatarImgSrc: 'avatar-1.png',
+      name: 'Selina Gomez',
+      time: '5 minutes ago',
+      comment: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinartempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio. Lorem ipsum dolor sit amet, consectetur adipiscing elit. ',
+    },
+    {
+      avatarImgSrc: 'avatar-2.png',
+      name: 'Chris Evan',
+      time: '5 minutes ago',
+      comment: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinartempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio. Lorem ipsum dolor sit amet, consectetur adipiscing elit. ',
+    },
+    {
+      avatarImgSrc: 'avatar-3.png',
+      name: 'Chris Brown',
+      time: '5 minutes ago',
+      comment: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinartempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio. Lorem ipsum dolor sit amet, consectetur adipiscing elit. ',
+    },
+    {
+      avatarImgSrc: 'avatar-4.png',
+      name: 'Taylor Swift',
+      time: '5 minutes ago',
+      comment: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinartempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio. Lorem ipsum dolor sit amet, consectetur adipiscing elit. ',
+    },
+    {
+      avatarImgSrc: 'avatar-5.png',
+      name: 'elly Chen',
+      time: '5 minutes ago',
+      comment: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinartempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio. Lorem ipsum dolor sit amet, consectetur adipiscing elit. ',
+    },
   ],
 
 });
diff --git a/src/routes/DronesMap/components/DronesMapView.jsx b/src/routes/DronesMap/components/DronesMapView.jsx
index f69868c..bfc121e 100644
--- a/src/routes/DronesMap/components/DronesMapView.jsx
+++ b/src/routes/DronesMap/components/DronesMapView.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import MarkerClusterer from 'node-js-marker-clusterer';
 import styles from './DronesMapView.scss';
@@ -21,7 +21,7 @@ const getLatLng = ({currentLocation}) => ({lng: currentLocation[0], lat: current
 class DronesMapView extends React.Component {
 
   componentDidMount() {
-    const { drones, mapSettings } = this.props;
+    const {drones, mapSettings} = this.props;
     this.map = new google.maps.Map(this.node, mapSettings);
     const id2Marker = {};
 
@@ -38,11 +38,11 @@ class DronesMapView extends React.Component {
       return marker;
     });
     this.id2Marker = id2Marker;
-    this.markerCluster = new MarkerClusterer(this.map, markers, { imagePath: '/img/m' });
+    this.markerCluster = new MarkerClusterer(this.map, markers, {imagePath: '/img/m'});
   }
 
   componentWillReceiveProps(nextProps) {
-    const { drones } = nextProps;
+    const {drones} = nextProps;
     drones.forEach((drone) => {
       const marker = this.id2Marker[drone.id];
       if (marker) {
@@ -53,7 +53,7 @@ class DronesMapView extends React.Component {
     this.markerCluster.repaint();
   }
 
-  shouldComponentUpdate() {
+  shouldComponentUpdate() { // eslint-disable-line lodash/prefer-constant
     // the whole logic is handled by google plugin
     return false;
   }
diff --git a/src/routes/DronesMap/containers/DronesMapContainer.js b/src/routes/DronesMap/containers/DronesMapContainer.js
index b95532b..3d7a866 100644
--- a/src/routes/DronesMap/containers/DronesMapContainer.js
+++ b/src/routes/DronesMap/containers/DronesMapContainer.js
@@ -1,10 +1,10 @@
-import { asyncConnect } from 'redux-connect';
+import {asyncConnect} from 'redux-connect';
 import {actions} from '../modules/DronesMap';
 
 import DronesMapView from '../components/DronesMapView';
 
 const resolve = [{
-  promise: ({ store }) => store.dispatch(actions.init()),
+  promise: ({store}) => store.dispatch(actions.init()),
 }];
 
 const mapState = (state) => state.dronesMap;
diff --git a/src/routes/DronesMap/index.js b/src/routes/DronesMap/index.js
index 5b00c0b..ba14d5f 100644
--- a/src/routes/DronesMap/index.js
+++ b/src/routes/DronesMap/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'drones-map',
@@ -9,7 +9,7 @@ export default (store) => ({
       const DronesMap = require('./containers/DronesMapContainer').default;
       const reducer = require('./modules/DronesMap').default;
 
-      injectReducer(store, { key: 'dronesMap', reducer });
+      injectReducer(store, {key: 'dronesMap', reducer});
       cb(null, DronesMap);
     }, 'DronesMap');
   },
diff --git a/src/routes/DronesMap/modules/DronesMap.js b/src/routes/DronesMap/modules/DronesMap.js
index eac3285..71ac81b 100644
--- a/src/routes/DronesMap/modules/DronesMap.js
+++ b/src/routes/DronesMap/modules/DronesMap.js
@@ -1,4 +1,4 @@
-import { handleActions } from 'redux-actions';
+import {handleActions} from 'redux-actions';
 import io from 'socket.io-client';
 import APIService from 'services/APIService';
 import config from '../../../../config/default';
@@ -29,9 +29,9 @@ export const DRONES_UPDATED = 'DronesMap/DRONES_UPDATED';
 
 // load drones and initialize socket
 export const init = () => async(dispatch) => {
-  const { body: {items: drones} } = await APIService.searchDrones({limit: DRONE_LIMIT});
+  const {body: {items: drones}} = await APIService.searchDrones({limit: DRONE_LIMIT});
   lastUpdated = new Date().getTime();
-  dispatch({ type: DRONES_LOADED, payload: {drones} });
+  dispatch({type: DRONES_LOADED, payload: {drones}});
   socket = io(config.API_BASE_PATH);
   socket.on('dronepositionupdate', (drone) => {
     pendingUpdates[drone.id] = drone;
@@ -39,7 +39,7 @@ export const init = () => async(dispatch) => {
       return;
     }
     updateTimeoutId = setTimeout(() => {
-      dispatch({ type: DRONES_UPDATED, payload: pendingUpdates });
+      dispatch({type: DRONES_UPDATED, payload: pendingUpdates});
       pendingUpdates = {};
       updateTimeoutId = null;
       lastUpdated = new Date().getTime();
@@ -66,8 +66,8 @@ export const actions = {
 // Reducer
 // ------------------------------------
 export default handleActions({
-  [DRONES_LOADED]: (state, { payload: {drones} }) => ({ ...state, drones }),
-  [DRONES_UPDATED]: (state, { payload: updates }) => ({
+  [DRONES_LOADED]: (state, {payload: {drones}}) => ({...state, drones}),
+  [DRONES_UPDATED]: (state, {payload: updates}) => ({
     ...state,
     drones: state.drones.map((drone) => {
       const updated = updates[drone.id];
@@ -79,6 +79,6 @@ export default handleActions({
   // it will show the whole globe
   mapSettings: {
     zoom: 3,
-    center: { lat: 0, lng: 0 },
+    center: {lat: 0, lng: 0},
   },
 });
diff --git a/src/routes/EditData/components/PictureFromMission/PictureFromMission.jsx b/src/routes/EditData/components/PictureFromMission/PictureFromMission.jsx
index d9c0e00..63eb596 100644
--- a/src/routes/EditData/components/PictureFromMission/PictureFromMission.jsx
+++ b/src/routes/EditData/components/PictureFromMission/PictureFromMission.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './PictureFromMission.scss';
 import UploadPictureForm from '../UploadPictureForm';
diff --git a/src/routes/EditData/components/TelemetryDataForm/TelemetryDataForm.jsx b/src/routes/EditData/components/TelemetryDataForm/TelemetryDataForm.jsx
index a2bd0d5..4c806ab 100644
--- a/src/routes/EditData/components/TelemetryDataForm/TelemetryDataForm.jsx
+++ b/src/routes/EditData/components/TelemetryDataForm/TelemetryDataForm.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import TextField from 'components/TextField';
 import DatePicker from 'components/DatePicker';
diff --git a/src/routes/EditData/components/TelemetryTabs/TelemetryTabs.jsx b/src/routes/EditData/components/TelemetryTabs/TelemetryTabs.jsx
index 33ac52c..5018664 100644
--- a/src/routes/EditData/components/TelemetryTabs/TelemetryTabs.jsx
+++ b/src/routes/EditData/components/TelemetryTabs/TelemetryTabs.jsx
@@ -1,7 +1,7 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import { Tab, Tabs, TabList, TabPanel } from 'react-tabs';
-import { reduxForm } from 'redux-form';
+import {Tab, Tabs, TabList, TabPanel} from 'react-tabs';
+import {reduxForm} from 'redux-form';
 import Button from 'components/Button';
 import styles from './TelemetryTabs.scss';
 import TelemetryDataForm from '../TelemetryDataForm';
@@ -78,5 +78,5 @@ const validate = (values) => {
   return errors;
 };
 
-export default reduxForm({ form: 'editDataForm', fields, validate })(CSSModules(TelemetryTabs, styles));
+export default reduxForm({form: 'editDataForm', fields, validate})(CSSModules(TelemetryTabs, styles));
 
diff --git a/src/routes/EditData/components/UploadPicture/UploadPicture.jsx b/src/routes/EditData/components/UploadPicture/UploadPicture.jsx
index 61cdd27..bc32164 100644
--- a/src/routes/EditData/components/UploadPicture/UploadPicture.jsx
+++ b/src/routes/EditData/components/UploadPicture/UploadPicture.jsx
@@ -1,5 +1,6 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
+import _ from 'lodash';
 import styles from './UploadPicture.scss';
 
 const getImage = (name) => `${window.location.origin}/img/uploaded/${name}`;
@@ -11,7 +12,7 @@ const getImage = (name) => `${window.location.origin}/img/uploaded/${name}`;
 
 export const UploadPicture = ({imageSrc, removePicture, index}) => (
   <li styleName="upload-picture">
-    <img src={imageSrc.indexOf('data:image') !== -1 ? imageSrc : getImage(imageSrc)} alt="uploaded" />
+    <img src={_.inclues(imageSrc, 'data:image') ? imageSrc : getImage(imageSrc)} alt="uploaded" />
     <a
       href="/service/javascript:;"
       onClick={(event) => {
diff --git a/src/routes/EditData/components/UploadPictureForm/UploadPictureForm.jsx b/src/routes/EditData/components/UploadPictureForm/UploadPictureForm.jsx
index 98d4ddf..f36b405 100644
--- a/src/routes/EditData/components/UploadPictureForm/UploadPictureForm.jsx
+++ b/src/routes/EditData/components/UploadPictureForm/UploadPictureForm.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import Button from 'components/Button';
 import styles from './UploadPictureForm.scss';
@@ -36,7 +36,7 @@ class UploadPictureForm extends React.Component {
   }
 
   render() {
-    const { file } = this.state;
+    const {file} = this.state;
 
     return (
       <div styleName="upload-picture">
diff --git a/src/routes/EditData/components/UploadedPictures/UploadedPictures.jsx b/src/routes/EditData/components/UploadedPictures/UploadedPictures.jsx
index 41d5e40..6d72cbc 100644
--- a/src/routes/EditData/components/UploadedPictures/UploadedPictures.jsx
+++ b/src/routes/EditData/components/UploadedPictures/UploadedPictures.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import Button from 'components/Button';
 import styles from './UploadedPictures.scss';
diff --git a/src/routes/EditData/containers/EditDataContainer.js b/src/routes/EditData/containers/EditDataContainer.js
index 6abed6d..4c5c8a1 100644
--- a/src/routes/EditData/containers/EditDataContainer.js
+++ b/src/routes/EditData/containers/EditDataContainer.js
@@ -1,4 +1,4 @@
-import { asyncConnect } from 'redux-connect';
+import {asyncConnect} from 'redux-connect';
 import {actions} from '../modules/EditData';
 
 import EditDataView from '../components/EditDataView';
diff --git a/src/routes/EditData/containers/EditDataHeaderContainer.js b/src/routes/EditData/containers/EditDataHeaderContainer.js
index f02493f..ce5a7b5 100644
--- a/src/routes/EditData/containers/EditDataHeaderContainer.js
+++ b/src/routes/EditData/containers/EditDataHeaderContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import EditDataHeader from '../components/EditDataHeader';
 
 const mapState = (state) => state.editData;
diff --git a/src/routes/EditData/containers/TelemetryTabsContainer.js b/src/routes/EditData/containers/TelemetryTabsContainer.js
index 86745e0..d3d690b 100644
--- a/src/routes/EditData/containers/TelemetryTabsContainer.js
+++ b/src/routes/EditData/containers/TelemetryTabsContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import {sendRequest, uploadPicture} from '../modules/EditData';
 
 import TelemetryTabs from '../components/TelemetryTabs';
diff --git a/src/routes/EditData/containers/UploadedPicturesContainer.js b/src/routes/EditData/containers/UploadedPicturesContainer.js
index 0ed4ca6..1996224 100644
--- a/src/routes/EditData/containers/UploadedPicturesContainer.js
+++ b/src/routes/EditData/containers/UploadedPicturesContainer.js
@@ -1,6 +1,6 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import UploadedPictures from '../components/UploadedPictures';
-import { deletePicture } from '../modules/EditData';
+import {deletePicture} from '../modules/EditData';
 
 
 const mapState = (state) => ({...state.editData});
diff --git a/src/routes/EditData/index.js b/src/routes/EditData/index.js
index 684c41b..c7407c3 100644
--- a/src/routes/EditData/index.js
+++ b/src/routes/EditData/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'edit-data',
@@ -9,7 +9,7 @@ export default (store) => ({
       const EditData = require('./containers/EditDataContainer').default;
       const reducer = require('./modules/EditData').default;
 
-      injectReducer(store, { key: 'editData', reducer });
+      injectReducer(store, {key: 'editData', reducer});
       cb(null, EditData);
     }, 'EditData');
   },
diff --git a/src/routes/EditData/modules/EditData.js b/src/routes/EditData/modules/EditData.js
index caa4704..5004a5c 100644
--- a/src/routes/EditData/modules/EditData.js
+++ b/src/routes/EditData/modules/EditData.js
@@ -1,4 +1,4 @@
-import { handleActions, createAction } from 'redux-actions';
+import {handleActions, createAction} from 'redux-actions';
 // ------------------------------------
 // Actions
 // ------------------------------------
diff --git a/src/routes/EditDrones/components/EditDronesForm/EditDronesForm.jsx b/src/routes/EditDrones/components/EditDronesForm/EditDronesForm.jsx
index 75cb5e2..a201f87 100644
--- a/src/routes/EditDrones/components/EditDronesForm/EditDronesForm.jsx
+++ b/src/routes/EditDrones/components/EditDronesForm/EditDronesForm.jsx
@@ -1,6 +1,6 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import { reduxForm } from 'redux-form';
+import {reduxForm} from 'redux-form';
 import Button from 'components/Button';
 import Checkbox from 'components/Checkbox';
 import TextField from 'components/TextField';
@@ -207,4 +207,4 @@ const validate = (values) => {
   return errors;
 };
 
-export default reduxForm({ form: 'editDrones', fields, validate })(CSSModules(EditDronesForm, styles));
+export default reduxForm({form: 'editDrones', fields, validate})(CSSModules(EditDronesForm, styles));
diff --git a/src/routes/EditDrones/containers/EditDronesContainer.js b/src/routes/EditDrones/containers/EditDronesContainer.js
index 86ba290..7cd2100 100644
--- a/src/routes/EditDrones/containers/EditDronesContainer.js
+++ b/src/routes/EditDrones/containers/EditDronesContainer.js
@@ -1,4 +1,4 @@
-import { asyncConnect } from 'redux-connect';
+import {asyncConnect} from 'redux-connect';
 import {actions} from '../modules/EditDrones';
 
 import EditDronesView from '../components/EditDronesView';
diff --git a/src/routes/EditDrones/containers/EditDronesFormContainer.js b/src/routes/EditDrones/containers/EditDronesFormContainer.js
index d02c73d..eed1a5f 100644
--- a/src/routes/EditDrones/containers/EditDronesFormContainer.js
+++ b/src/routes/EditDrones/containers/EditDronesFormContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import {actions, sendRequest} from '../modules/EditDrones';
 
 import EditDronesForm from '../components/EditDronesForm';
diff --git a/src/routes/EditDrones/index.js b/src/routes/EditDrones/index.js
index 305c9cb..5d156bc 100644
--- a/src/routes/EditDrones/index.js
+++ b/src/routes/EditDrones/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'edit-drones',
@@ -9,7 +9,7 @@ export default (store) => ({
       const EditDrones = require('./containers/EditDronesContainer').default;
       const reducer = require('./modules/EditDrones').default;
 
-      injectReducer(store, { key: 'editDrones', reducer });
+      injectReducer(store, {key: 'editDrones', reducer});
       cb(null, EditDrones);
     }, 'EditDrones');
   },
diff --git a/src/routes/EditDrones/modules/EditDrones.js b/src/routes/EditDrones/modules/EditDrones.js
index dd17ce1..f72bb4f 100644
--- a/src/routes/EditDrones/modules/EditDrones.js
+++ b/src/routes/EditDrones/modules/EditDrones.js
@@ -1,4 +1,4 @@
-import { handleActions } from 'redux-actions';
+import {handleActions} from 'redux-actions';
 
 
 // ------------------------------------
diff --git a/src/routes/Home/components/BrowseServices/BrowseServices.jsx b/src/routes/Home/components/BrowseServices/BrowseServices.jsx
index aa361d3..dc84b81 100644
--- a/src/routes/Home/components/BrowseServices/BrowseServices.jsx
+++ b/src/routes/Home/components/BrowseServices/BrowseServices.jsx
@@ -1,31 +1,26 @@
-import React, { PropTypes, Component } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './BrowseServices.scss';
 import BrowseServicesItem from '../BrowseServicesItem';
 import HomeSectionHeader from '../HomeSectionHeader';
 
-class BrowseServices extends Component {
+const BrowseServices = (props) => (
+  <div styleName="browse-services">
+    <HomeSectionHeader
+      title={'Browse Services By Category'}
+      seeAll={'See All Category'}
+    />
 
-  render() {
-    return (
-      <div styleName="browse-services">
-        <HomeSectionHeader
-          title={'Browse Services By Category'}
-          seeAll={'See All Category'}
-        />
+    <div styleName="browse-services-items">
+      {
+        props.categories.map((category, i) => (
+          <div key={i}><BrowseServicesItem category={category} /></div>
+        ))
+      }
 
-        <div styleName="browse-services-items">
-          {
-            this.props.categories.map((category, i) => (
-              <div key={i}><BrowseServicesItem category={category} /></div>
-            ))
-          }
-
-        </div>
-      </div>
-    );
-  }
-}
+    </div>
+  </div>
+);
 
 BrowseServices.propTypes = {
   categories: PropTypes.array.isRequired,
diff --git a/src/routes/Home/components/BrowseServicesItem/BrowseServicesItem.jsx b/src/routes/Home/components/BrowseServicesItem/BrowseServicesItem.jsx
index 39ea65b..514dd27 100644
--- a/src/routes/Home/components/BrowseServicesItem/BrowseServicesItem.jsx
+++ b/src/routes/Home/components/BrowseServicesItem/BrowseServicesItem.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './BrowseServicesItem.scss';
 
diff --git a/src/routes/Home/components/HomeBanner/HomeBanner.jsx b/src/routes/Home/components/HomeBanner/HomeBanner.jsx
index 9281f67..1004284 100644
--- a/src/routes/Home/components/HomeBanner/HomeBanner.jsx
+++ b/src/routes/Home/components/HomeBanner/HomeBanner.jsx
@@ -1,10 +1,10 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
 import CSSModules from 'react-css-modules';
-import { Link } from 'react-router';
+import {Link} from 'react-router';
 import styles from './HomeBanner.scss';
 import Button from 'components/Button';
 
-export const HomeBanner = ({}) => (
+export const HomeBanner = () => (
   <div styleName="home-banner">
     <div styleName="banner-bg">
       <h2>GET THINGS DONE BY DRONE</h2>
diff --git a/src/routes/Home/components/HomeSectionHeader/HomeSectionHeader.jsx b/src/routes/Home/components/HomeSectionHeader/HomeSectionHeader.jsx
index 3a2a020..57afcfa 100644
--- a/src/routes/Home/components/HomeSectionHeader/HomeSectionHeader.jsx
+++ b/src/routes/Home/components/HomeSectionHeader/HomeSectionHeader.jsx
@@ -1,9 +1,8 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './HomeSectionHeader.scss';
-import Button from 'components/Button';
 
-export const HomeSectionHeader = ({...props}) => (
+export const HomeSectionHeader = (props) => (
   <div styleName="home-section-header">
     <p className="section-title">{props.title}</p>
     <a href="/service/javascript:;">{props.seeAll}</a>
@@ -11,6 +10,8 @@ export const HomeSectionHeader = ({...props}) => (
 );
 
 HomeSectionHeader.propTypes = {
+  title: PropTypes.string,
+  seeAll: PropTypes.string,
 };
 
 export default CSSModules(HomeSectionHeader, styles);
diff --git a/src/routes/Home/components/HomeView.jsx b/src/routes/Home/components/HomeView.jsx
index b9fbc92..6f27e9a 100644
--- a/src/routes/Home/components/HomeView.jsx
+++ b/src/routes/Home/components/HomeView.jsx
@@ -33,6 +33,7 @@ HomeView.propTypes = {
   popularDrones: PropTypes.array.isRequired,
   promotedServices: PropTypes.array.isRequired,
   categories: PropTypes.array.isRequired,
+  lastCompletedMissionsData: PropTypes.object.isRequired,
 };
 
 export default CSSModules(HomeView, styles);
diff --git a/src/routes/Home/components/HowItWorks/HowItWorks.jsx b/src/routes/Home/components/HowItWorks/HowItWorks.jsx
index 27c4358..4393a47 100644
--- a/src/routes/Home/components/HowItWorks/HowItWorks.jsx
+++ b/src/routes/Home/components/HowItWorks/HowItWorks.jsx
@@ -1,9 +1,8 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './HowItWorks.scss';
-import Button from 'components/Button';
 
-export const HowItWorks = ({}) => (
+export const HowItWorks = () => (
   <div styleName="how-it-works">
     <div styleName="how-it-works-bg">
       <h2>How it Works</h2>
diff --git a/src/routes/Home/components/LastCompletedMissions/LastCompletedMissions.jsx b/src/routes/Home/components/LastCompletedMissions/LastCompletedMissions.jsx
index 2b35d09..1ab9a0e 100644
--- a/src/routes/Home/components/LastCompletedMissions/LastCompletedMissions.jsx
+++ b/src/routes/Home/components/LastCompletedMissions/LastCompletedMissions.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './LastCompletedMissions.scss';
 import LastCompletedMissionsItem from '../LastCompletedMissionsItem';
@@ -15,7 +15,7 @@ export const LastCompletedMissions = ({lastCompletedMissionsData}) => (
       <div styleName="completed-mission-conatiner">
         {lastCompletedMissionsData.map((lastCompletedMissionItemData, index) =>
           <LastCompletedMissionsItem key={index} lastCompletedMissionItemData={lastCompletedMissionItemData} />
-				)}
+        )}
       </div>
     </div>
   </div>
diff --git a/src/routes/Home/components/LastCompletedMissionsItem/LastCompletedMissionsItem.jsx b/src/routes/Home/components/LastCompletedMissionsItem/LastCompletedMissionsItem.jsx
index 6260ab9..663268d 100644
--- a/src/routes/Home/components/LastCompletedMissionsItem/LastCompletedMissionsItem.jsx
+++ b/src/routes/Home/components/LastCompletedMissionsItem/LastCompletedMissionsItem.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './LastCompletedMissionsItem.scss';
 
diff --git a/src/routes/Home/components/LoginModal/LoginModal.jsx b/src/routes/Home/components/LoginModal/LoginModal.jsx
index b8830f5..5bd807e 100644
--- a/src/routes/Home/components/LoginModal/LoginModal.jsx
+++ b/src/routes/Home/components/LoginModal/LoginModal.jsx
@@ -1,19 +1,12 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import { Link, browserHistory } from 'react-router';
-import { Field, reduxForm } from 'redux-form';
+import {reduxForm} from 'redux-form';
 import cn from 'classnames';
 import Modal from 'react-modal';
 import Button from 'components/Button';
 import Checkbox from 'components/Checkbox';
 import TextField from 'components/TextField';
-import styles from './LogInModal.scss';
-const { DOM: { input } } = React;
-
-import UserApi from 'api/User.js';
-const config = require('../../../../config');
-const userApi = new UserApi(config.default.api.basePath);
-
+import styles from './LoginModal.scss';
 /*
 * customStyles
 */
@@ -40,12 +33,18 @@ const customStyles = {
     zIndex: '99999',
   },
 };
-const FormField = ({label, error, touched, children}) => (
+const FormField = ({error, touched, children}) => (
   <div className={cn('form-field', {error: error && touched})}>
     {children}
     {error && touched && <div className="error-message">{error}</div>}
   </div>
 );
+FormField.propTypes = {
+  error: PropTypes.string,
+  touched: PropTypes.bool,
+  children: PropTypes.any,
+};
+
 /*
 * LogInModal
 */
@@ -54,7 +53,7 @@ class LogInModal extends React.Component {
   constructor() {
     super();
     this.state = {
-      modalLoginIsOpen: false
+      modalLoginIsOpen: false,
     };
   }
 
@@ -62,14 +61,11 @@ class LogInModal extends React.Component {
     this.setState({modalLoginIsOpen: true});
   }
 
-  afterOpenLoginModal() {
-  }
-
   closeLoginModal() {
     this.setState({modalLoginIsOpen: false});
   }
 
-  login(email, pass) {
+  login() {
     this.setState({modalLoginIsOpen: true});
   }
 
@@ -86,7 +82,7 @@ class LogInModal extends React.Component {
   }
 
   render() {
-    const { handleSubmit, pristine, reset, submitting, fields, handleLoggedIn, loggedUser, hasError, errorText } = this.props;
+    const {handleSubmit, fields, handleLoggedIn, loggedUser, hasError, errorText} = this.props;
 
     return (
       <div styleName="signin-modal">
@@ -121,13 +117,13 @@ class LogInModal extends React.Component {
                 <span>Log In with Google Plus</span>
               </a>
             </div>
-            {/* login with end*/}
+            {/* login with end */}
             <div styleName="or-border">
               <div styleName="left-line" />
               <div styleName="or">or</div>
               <div styleName="right-line" />
             </div>
-            {/* or end*/}
+            {/* or end */}
             <div>
               {hasError && <span className="error-msg">{errorText.error}</span>}
               <div styleName="email-input">
@@ -141,11 +137,11 @@ class LogInModal extends React.Component {
                 </FormField>
               </div>
             </div>
-            {/* input end*/}
+            {/* input end */}
             <div styleName="rem-forget">
               <div styleName="rem-checkbox">
                 <Checkbox
-                  checked={this.props.fields.remember.value != true}
+                  checked={!this.props.fields.remember.value}
                   onChange={() => this.props.fields.remember.onChange(!this.props.fields.remember.value)}
                   id="remember"
                 >
@@ -157,18 +153,18 @@ class LogInModal extends React.Component {
             <div styleName="login-btn">
               <Button
                 type="submit" color="black"
-                className={styles.btnLogin} onClick={(e) => this.handleLogin(handleLoggedIn, loggedUser)}
+                className={styles.btnLogin} onClick={() => this.handleLogin(handleLoggedIn, loggedUser)}
               >
                 Log In
               </Button>
             </div>
             <div styleName="dont-have">
-              Don&#8217;t have an account?            <a href="/service/javascript:;" className="singup" >Sign Up</a>
+              Don&#8217;t have an account? <a href="/service/javascript:;" className="singup" >Sign Up</a>
             </div>
           </form>
         </Modal>
 
-        
+
       </div>
     );
   }
@@ -176,6 +172,11 @@ class LogInModal extends React.Component {
 
 LogInModal.propTypes = {
   handleSubmit: PropTypes.func.isRequired,
+  fields: PropTypes.object,
+  handleLoggedIn: PropTypes.func.isRequired,
+  loggedUser: PropTypes.bool,
+  hasError: PropTypes.bool,
+  errorText: PropTypes.string,
 };
 
 const fields = ['remember', 'email', 'password', 'emailUp', 'passwordUp'];
@@ -194,4 +195,4 @@ const validate = (values) => {
 };
 
 
-export default reduxForm({ form: 'loginForm', fields, validate })(CSSModules(LogInModal, styles));
+export default reduxForm({form: 'loginForm', fields, validate})(CSSModules(LogInModal, styles));
diff --git a/src/routes/Home/components/LoginModal/index.js b/src/routes/Home/components/LoginModal/index.js
index 38ae73c..fc66458 100644
--- a/src/routes/Home/components/LoginModal/index.js
+++ b/src/routes/Home/components/LoginModal/index.js
@@ -1,3 +1,3 @@
-import LogInModal from './LogInModal';
+import LogInModal from './LoginModal';
 
 export default LogInModal;
diff --git a/src/routes/Home/components/PopularDroneSliderItem/PopularDroneSliderItem.jsx b/src/routes/Home/components/PopularDroneSliderItem/PopularDroneSliderItem.jsx
index 902bb86..b07d7aa 100644
--- a/src/routes/Home/components/PopularDroneSliderItem/PopularDroneSliderItem.jsx
+++ b/src/routes/Home/components/PopularDroneSliderItem/PopularDroneSliderItem.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './PopularDroneSliderItem.scss';
 import ProvidersGridTooltips from '../ProvidersGridTooltips';
diff --git a/src/routes/Home/components/PopularDronesSlides/PopularDronesSlides.jsx b/src/routes/Home/components/PopularDronesSlides/PopularDronesSlides.jsx
index 6b9fbe7..76b7f20 100644
--- a/src/routes/Home/components/PopularDronesSlides/PopularDronesSlides.jsx
+++ b/src/routes/Home/components/PopularDronesSlides/PopularDronesSlides.jsx
@@ -1,46 +1,41 @@
-import React, { PropTypes, Component } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './PopularDronesSlides.scss';
 import PopularDroneSliderItem from '../PopularDroneSliderItem';
 import HomeSectionHeader from '../HomeSectionHeader';
+import Slider from 'react-slick';
 
-const Slider = require('react-slick');
+const PopularDronesSlides = (props) => {
+  const settings = {
+    customPaging(i) {
+      return <div>{i}</div>;
+    },
+    dots: true,
+    infinite: false,
+    speed: 500,
+    slidesToShow: 4,
+    slidesToScroll: 4,
+    arrows: true,
+  };
+  return (
+    <div styleName="popular-drones-slides">
+      <HomeSectionHeader
+        title={'Popular Drone Services Nearby Jakarta, Indonesia'}
+        seeAll={'See all popular drones'}
+      />
 
-
-class PopularDronesSlides extends Component {
-
-  render() {
-    const settings = {
-      customPaging(i) {
-        return <div>{i}</div>;
-      },
-      dots: true,
-      infinite: false,
-      speed: 500,
-      slidesToShow: 4,
-      slidesToScroll: 4,
-      arrows: true,
-    };
-    return (
-      <div styleName="popular-drones-slides">
-        <HomeSectionHeader
-          title={'Popular Drone Services Nearby Jakarta, Indonesia'}
-          seeAll={'See all popular drones'}
-        />
-
-        <div className="drones-slides">
-          <Slider {...settings}>
-            {
-            this.props.popularDrones.map((drone, i) => (
+      <div className="drones-slides">
+        <Slider {...settings}>
+          {
+            props.popularDrones.map((drone, i) => (
               <div key={i}><PopularDroneSliderItem droneInfo={drone} /></div>
             ))
           }
-          </Slider>
-        </div>
+        </Slider>
       </div>
-    );
-  }
-}
+    </div>
+  );
+};
 
 PopularDronesSlides.propTypes = {
   popularDrones: PropTypes.array.isRequired,
diff --git a/src/routes/Home/components/PromotedService/PromotedService.jsx b/src/routes/Home/components/PromotedService/PromotedService.jsx
index 165918f..9f73d6d 100644
--- a/src/routes/Home/components/PromotedService/PromotedService.jsx
+++ b/src/routes/Home/components/PromotedService/PromotedService.jsx
@@ -1,32 +1,25 @@
-import React, { PropTypes, Component } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './PromotedService.scss';
-import PopularDroneSliderItem from '../PopularDroneSliderItem';
 import PromotedServiceItem from '../PromotedServiceItem';
 import HomeSectionHeader from '../HomeSectionHeader';
 
-class PromotedService extends Component {
+const PromotedService = (props) => (
+  <div styleName="promote-service">
+    <HomeSectionHeader
+      title={'Promoted Services Nearby Jakarta, Indonesia'}
+      seeAll={'See all services'}
+    />
 
-  render() {
-    return (
-      <div styleName="promote-service">
-        <HomeSectionHeader
-          title={'Promoted Services Nearby Jakarta, Indonesia'}
-          seeAll={'See all services'}
-        />
-
-        <div styleName="promote-service-items">
-          {
-            this.props.promotedServices.map((service, i) => (
-              <div key={i}><PromotedServiceItem promotedService={service} /></div>
-            ))
-          }
-
-        </div>
-      </div>
-    );
-  }
-}
+    <div styleName="promote-service-items">
+      {
+        props.promotedServices.map((service, i) => (
+          <div key={i}><PromotedServiceItem promotedService={service} /></div>
+        ))
+      }
+    </div>
+  </div>
+);
 
 PromotedService.propTypes = {
   promotedServices: PropTypes.array.isRequired,
diff --git a/src/routes/Home/components/PromotedServiceItem/PromotedServiceItem.jsx b/src/routes/Home/components/PromotedServiceItem/PromotedServiceItem.jsx
index a47bbb1..4ed06a5 100644
--- a/src/routes/Home/components/PromotedServiceItem/PromotedServiceItem.jsx
+++ b/src/routes/Home/components/PromotedServiceItem/PromotedServiceItem.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './PromotedServiceItem.scss';
 
diff --git a/src/routes/Home/components/ProvidersGridTooltips/ProvidersGridTooltips.jsx b/src/routes/Home/components/ProvidersGridTooltips/ProvidersGridTooltips.jsx
index dbf875b..59a1074 100644
--- a/src/routes/Home/components/ProvidersGridTooltips/ProvidersGridTooltips.jsx
+++ b/src/routes/Home/components/ProvidersGridTooltips/ProvidersGridTooltips.jsx
@@ -1,14 +1,9 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import enhanceWithClickOutside from 'react-click-outside';
 import styles from './ProvidersGridTooltips.scss';
 
-const getImage = (name) => `${window.location.origin}/img/drones/${name}`;
-
 class ProvidersGridTooltips extends React.Component {
-  componentDidMount() {
-    const { droneInfo } = this.props;
-  }
   constructor() {
     super();
     this.state = {
@@ -16,11 +11,11 @@ class ProvidersGridTooltips extends React.Component {
     };
   }
   handleClickOutside() {
-    this.setState({ isHidden: true });
+    this.setState({isHidden: true});
   }
   toggleHidden() {
     this.setState({
-      isHidden: this.state.isHidden ? false : true,
+      isHidden: !this.state.isHidden,
     });
   }
 
diff --git a/src/routes/Home/components/SignupModal/SignupModal.jsx b/src/routes/Home/components/SignupModal/SignupModal.jsx
index a2657f6..213d6e6 100644
--- a/src/routes/Home/components/SignupModal/SignupModal.jsx
+++ b/src/routes/Home/components/SignupModal/SignupModal.jsx
@@ -1,18 +1,11 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import { Link, browserHistory } from 'react-router';
-import { Field, reduxForm } from 'redux-form';
+import {reduxForm} from 'redux-form';
 import cn from 'classnames';
 import Modal from 'react-modal';
 import Button from 'components/Button';
-import Checkbox from 'components/Checkbox';
 import TextField from 'components/TextField';
 import styles from './SignupModal.scss';
-const { DOM: { input } } = React;
-
-import UserApi from 'api/User.js';
-const config = require('../../../../config');
-const userApi = new UserApi(config.default.api.basePath);
 
 /*
 * customStyles
@@ -40,12 +33,18 @@ const customStyles = {
     zIndex: '99999',
   },
 };
-const FormField = ({label, error, touched, children}) => (
+const FormField = ({error, touched, children}) => (
   <div className={cn('form-field', {error: error && touched})}>
     {children}
     {error && touched && <div className="error-message">{error}</div>}
   </div>
 );
+FormField.propTypes = {
+  error: PropTypes.string,
+  touched: PropTypes.bool,
+  children: PropTypes.any,
+};
+
 /*
 * SignupModal
 */
@@ -54,7 +53,7 @@ class SignupModal extends React.Component {
   constructor() {
     super();
     this.state = {
-      modalSignupIsOpen: false
+      modalSignupIsOpen: false,
     };
   }
 
@@ -62,14 +61,11 @@ class SignupModal extends React.Component {
     this.setState({modalSignupIsOpen: true});
   }
 
-  afterOpenSignupModal() {
-  }
-
   closeSignupModal() {
     this.setState({modalSignupIsOpen: false});
   }
 
-  signup(email, pass) {
+  signup() {
     this.setState({modalSignupIsOpen: true});
   }
 
@@ -77,7 +73,6 @@ class SignupModal extends React.Component {
     handleSigned();
     const _self = this;
     setTimeout(() => {
-      handleSignup();
       if (signedUser) {
         _self.setState({modalSignupIsOpen: false});
       }
@@ -85,7 +80,7 @@ class SignupModal extends React.Component {
   }
 
   render() {
-    const { handleSubmit, pristine, reset, submitting, fields, handleSigned, signedUser, hasError, errorText } = this.props;
+    const {handleSubmit, fields, handleSigned, signedUser, hasError, errorText} = this.props;
 
     return (
       <div styleName="signin-modal">
@@ -120,13 +115,13 @@ class SignupModal extends React.Component {
                 <span>Sign Up with Google Plus</span>
               </a>
             </div>
-            {/* login with end*/}
+            {/* login with end */}
             <div styleName="or-border">
               <div styleName="left-line" />
               <div styleName="or">or</div>
               <div styleName="right-line" />
             </div>
-            {/* or end*/}
+            {/* or end */}
             <div>
               {hasError && <span className="error-msg">{errorText.error}</span>}
               <div styleName="email-input">
@@ -140,23 +135,23 @@ class SignupModal extends React.Component {
                 </FormField>
               </div>
             </div>
-            {/* input end*/}
-            
+            {/* input end */}
+
             <div styleName="login-btn">
               <Button
                 type="submit" color="black"
-                className={styles.btnLogin} onClick={(e) => this.handleSignup(handleSigned, signedUser)}
+                className={styles.btnLogin} onClick={() => this.handleSignup(handleSigned, signedUser)}
               >
                 Sign Up
               </Button>
             </div>
             <div styleName="dont-have">
-              Don&#8217;t have an account?            <a href="/service/javascript:;" className="singup" >Log In</a>
+              Don&#8217;t have an account? <a href="/service/javascript:;" className="singup" >Log In</a>
             </div>
           </form>
         </Modal>
 
-        
+
       </div>
     );
   }
@@ -164,6 +159,11 @@ class SignupModal extends React.Component {
 
 SignupModal.propTypes = {
   handleSubmit: PropTypes.func.isRequired,
+  fields: PropTypes.object,
+  handleSigned: PropTypes.func.isRequired,
+  signedUser: PropTypes.object,
+  hasError: PropTypes.bool,
+  errorText: PropTypes.string,
 };
 
 const fields = ['email', 'password', 'emailUp', 'passwordUp'];
@@ -182,4 +182,4 @@ const validate = (values) => {
 };
 
 
-export default reduxForm({ form: 'signupForm', fields, validate })(CSSModules(SignupModal, styles));
+export default reduxForm({form: 'signupForm', fields, validate})(CSSModules(SignupModal, styles));
diff --git a/src/routes/Home/components/TopDrones/TopDrones.jsx b/src/routes/Home/components/TopDrones/TopDrones.jsx
index 4d640d6..e1b1130 100644
--- a/src/routes/Home/components/TopDrones/TopDrones.jsx
+++ b/src/routes/Home/components/TopDrones/TopDrones.jsx
@@ -1,33 +1,25 @@
-import React, { PropTypes, Component } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './TopDrones.scss';
 import TopDronesItem from '../TopDronesItem';
 import HomeSectionHeader from '../HomeSectionHeader';
 
-const Slider = require('react-slick');
+const TopDrones = (props) => (
+  <div styleName="popular-drones-slides">
+    <HomeSectionHeader
+      title={'Top Drone Provider Nearby Jakarta, Indonesia'}
+      seeAll={'See all providers'}
+    />
 
-
-class TopDrones extends Component {
-
-  render() {
-    return (
-      <div styleName="popular-drones-slides">
-        <HomeSectionHeader
-          title={'Top Drone Provider Nearby Jakarta, Indonesia'}
-          seeAll={'See all providers'}
-        />
-
-        <div styleName="drones-slides">
-          {
-            this.props.popularDrones.map((drone, i) => (
-              i < 4 && <div key={i}><TopDronesItem droneInfo={drone} /></div>
-            ))
-          }
-        </div>
-      </div>
-    );
-  }
-}
+    <div styleName="drones-slides">
+      {
+        props.popularDrones.map((drone, i) => (
+          i < 4 && <div key={i}><TopDronesItem droneInfo={drone} /></div>
+        ))
+      }
+    </div>
+  </div>
+);
 
 TopDrones.propTypes = {
   popularDrones: PropTypes.array.isRequired,
diff --git a/src/routes/Home/components/TopDronesItem/TopDronesItem.jsx b/src/routes/Home/components/TopDronesItem/TopDronesItem.jsx
index e054d83..5ee80df 100644
--- a/src/routes/Home/components/TopDronesItem/TopDronesItem.jsx
+++ b/src/routes/Home/components/TopDronesItem/TopDronesItem.jsx
@@ -1,7 +1,6 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './TopDronesItem.scss';
-import Button from 'components/Button';
 import ProvidersGridTooltips from '../ProvidersGridTooltips';
 
 const getImage = (name) => `${window.location.origin}/img/drones/${name}`;
diff --git a/src/routes/Home/containers/HomeContainer.js b/src/routes/Home/containers/HomeContainer.js
index e551fab..0b75de3 100644
--- a/src/routes/Home/containers/HomeContainer.js
+++ b/src/routes/Home/containers/HomeContainer.js
@@ -1,4 +1,4 @@
-import { asyncConnect } from 'redux-connect';
+import {asyncConnect} from 'redux-connect';
 import {actions} from '../modules/Home';
 
 import HomeView from '../components/HomeView';
diff --git a/src/routes/Home/containers/LoginModalContainer.js b/src/routes/Home/containers/LoginModalContainer.js
index 0378240..5bf37b8 100644
--- a/src/routes/Home/containers/LoginModalContainer.js
+++ b/src/routes/Home/containers/LoginModalContainer.js
@@ -1,7 +1,6 @@
-import { connect } from 'react-redux';
-import {actions, sendLoginRequest, loginAction} from '../../../store/modules/global';
-
-import LogInModal from '../components/LogInModal';
+import {connect} from 'react-redux';
+import {sendLoginRequest, loginAction} from '../../../store/modules/global';
+import LogInModal from '../components/LoginModal';
 
 const mapState = (state) => ({...state.global, onSubmit: sendLoginRequest});
 
diff --git a/src/routes/Home/containers/SignupModalContainer.js b/src/routes/Home/containers/SignupModalContainer.js
index 710a947..8640ff9 100644
--- a/src/routes/Home/containers/SignupModalContainer.js
+++ b/src/routes/Home/containers/SignupModalContainer.js
@@ -1,5 +1,5 @@
-import { connect } from 'react-redux';
-import {actions, sendSignupRequest, signupAction} from '../../../store/modules/global';
+import {connect} from 'react-redux';
+import {sendSignupRequest, signupAction} from '../../../store/modules/global';
 
 import SignupModal from '../components/SignupModal';
 
diff --git a/src/routes/Home/index.js b/src/routes/Home/index.js
index 7f8c3c3..25db534 100644
--- a/src/routes/Home/index.js
+++ b/src/routes/Home/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'home',
@@ -9,7 +9,7 @@ export default (store) => ({
       const Home = require('./containers/HomeContainer').default;
       const reducer = require('./modules/Home').default;
 
-      injectReducer(store, { key: 'home', reducer });
+      injectReducer(store, {key: 'home', reducer});
       cb(null, Home);
     }, 'Home');
   },
diff --git a/src/routes/Home/modules/Home.js b/src/routes/Home/modules/Home.js
index 913253d..1d02f92 100644
--- a/src/routes/Home/modules/Home.js
+++ b/src/routes/Home/modules/Home.js
@@ -1,4 +1,4 @@
-import { handleActions, createAction } from 'redux-actions';
+import {handleActions} from 'redux-actions';
 
 // ------------------------------------
 // Actions
@@ -11,25 +11,21 @@ export const sendRequest = (values) => new Promise((resolve) => {
 });
 
 
-export const actions = {
-
-};
+export const actions = {};
 
 // ------------------------------------
 // Reducer
 // ------------------------------------
-export default handleActions({
-
-}, {
+export default handleActions({}, {
   // initial data
   popularDrones: [
-  	{imgSrc: 'drone-1.png', droneName: 'Drone Maniac', completedJob: 21, sponsored: true},
-  	{imgSrc: 'drone-2.png', droneName: 'Pro Flying', completedJob: 20, sponsored: false},
-  	{imgSrc: 'drone-3.png', droneName: 'XtremeDrone', completedJob: 21, sponsored: false},
-  	{imgSrc: 'drone-4.png', droneName: 'Drone Maniac', completedJob: 11, sponsored: false},
-  	{imgSrc: 'drone-3.png', droneName: 'XtremeDrone', completedJob: 21, sponsored: false},
-  	{imgSrc: 'drone-2.png', droneName: 'Pro Flying', completedJob: 31, sponsored: false},
-  	{imgSrc: 'drone-1.png', droneName: 'Drone Maniac', completedJob: 25, sponsored: false},
+    {imgSrc: 'drone-1.png', droneName: 'Drone Maniac', completedJob: 21, sponsored: true},
+    {imgSrc: 'drone-2.png', droneName: 'Pro Flying', completedJob: 20, sponsored: false},
+    {imgSrc: 'drone-3.png', droneName: 'XtremeDrone', completedJob: 21, sponsored: false},
+    {imgSrc: 'drone-4.png', droneName: 'Drone Maniac', completedJob: 11, sponsored: false},
+    {imgSrc: 'drone-3.png', droneName: 'XtremeDrone', completedJob: 21, sponsored: false},
+    {imgSrc: 'drone-2.png', droneName: 'Pro Flying', completedJob: 31, sponsored: false},
+    {imgSrc: 'drone-1.png', droneName: 'Drone Maniac', completedJob: 25, sponsored: false},
     {imgSrc: 'drone-1.png', droneName: 'XtremeDrone', completedJob: 22, sponsored: true},
     {imgSrc: 'drone-2.png', droneName: 'Drone Maniac', completedJob: 21, sponsored: false},
     {imgSrc: 'drone-3.png', droneName: 'Pro Flying', completedJob: 21, sponsored: false},
@@ -47,37 +43,97 @@ export default handleActions({
   ],
 
   promotedServices: [
-    {imgSrc: 'drone-1.png', serviceName: 'Lorem Ipsum Services + XYX Loem',
-      serviceCategory: 'Delivery', offPercent: 50, price: 700, newPrice: 350},
-    {imgSrc: 'drone-2.png', serviceName: 'Lorem Ipsum Services + XYX Loem',
-      serviceCategory: 'Mapping', offPercent: 50, price: 700, newPrice: 350},
-    {imgSrc: 'drone-3.png', serviceName: 'Lorem Ipsum Services + XYX Loem',
-      serviceCategory: 'Monitoring', offPercent: 50, price: 700, newPrice: 350},
-    {imgSrc: 'drone-4.png', serviceName: 'Lorem Ipsum Services + XYX Loem',
-      serviceCategory: 'Photography', offPercent: 50, price: 700, newPrice: 350},
+    {
+      imgSrc: 'drone-1.png',
+      serviceName: 'Lorem Ipsum Services + XYX Loem',
+      serviceCategory: 'Delivery',
+      offPercent: 50,
+      price: 700,
+      newPrice: 350,
+    },
+    {
+      imgSrc: 'drone-2.png',
+      serviceName: 'Lorem Ipsum Services + XYX Loem',
+      serviceCategory: 'Mapping',
+      offPercent: 50,
+      price: 700,
+      newPrice: 350,
+    },
+    {
+      imgSrc: 'drone-3.png',
+      serviceName: 'Lorem Ipsum Services + XYX Loem',
+      serviceCategory: 'Monitoring',
+      offPercent: 50,
+      price: 700,
+      newPrice: 350,
+    },
+    {
+      imgSrc: 'drone-4.png',
+      serviceName: 'Lorem Ipsum Services + XYX Loem',
+      serviceCategory: 'Photography',
+      offPercent: 50,
+      price: 700,
+      newPrice: 350,
+    },
   ],
 
   categories: [
     {categoryImgSrc: 'delivery-category-pic.png', categoryName: 'Delivery', iconName: 'icon-delivery-category'},
     {categoryImgSrc: 'mapping-category-pic.png', categoryName: 'Mapping', iconName: 'icon-mapping-category'},
     {categoryImgSrc: 'monitoring-category-pic.png', categoryName: 'Monitoring', iconName: 'icon-monitoring-category'},
-    {categoryImgSrc: 'photography-category-pic.png', categoryName: 'Photography', iconName: 'icon-photography-category'},
+    {
+      categoryImgSrc: 'photography-category-pic.png',
+      categoryName: 'Photography',
+      iconName: 'icon-photography-category',
+    },
     {categoryImgSrc: 'filming-category-pic.png', categoryName: 'Filming', iconName: 'icon-filming-category'},
-    {categoryImgSrc: 'construction-category-pic.png', categoryName: 'Construction', iconName: 'icon-construction-category'},
+    {
+      categoryImgSrc: 'construction-category-pic.png',
+      categoryName: 'Construction',
+      iconName: 'icon-construction-category',
+    },
     {categoryImgSrc: 'delivery-category-pic.png', categoryName: 'Delivery', iconName: 'icon-delivery-category'},
     {categoryImgSrc: 'mapping-category-pic.png', categoryName: 'Mapping', iconName: 'icon-mapping-category'},
     {categoryImgSrc: 'monitoring-category-pic.png', categoryName: 'Monitoring', iconName: 'icon-monitoring-category'},
-    {categoryImgSrc: 'photography-category-pic.png', categoryName: 'Photography', iconName: 'icon-photography-category'},
+    {
+      categoryImgSrc: 'photography-category-pic.png',
+      categoryName: 'Photography',
+      iconName: 'icon-photography-category',
+    },
   ],
 
   lastCompletedMissionsData: [
-    {routeImg: 'route-1.png', missionTitle: 'Lorem Ipsum Mission Title', id: '123456789ABC',
-      droneProvider: 'Drone Maniac', date: ' 10/24/2016  09:30 AM', location: 'Street address lorem...'},
-    {routeImg: 'route-1.png', missionTitle: 'Lorem Ipsum Mission Title', id: '123456789ABC',
-      droneProvider: 'Drone Maniac', date: ' 10/24/2016  09:30 AM', location: 'Street address lorem...'},
-    {routeImg: 'route-1.png', missionTitle: 'Lorem Ipsum Mission Title', id: '123456789ABC',
-      droneProvider: 'Drone Maniac', date: ' 10/24/2016  09:30 AM', location: 'Street address lorem...'},
-    {routeImg: 'route-1.png', missionTitle: 'Lorem Ipsum Mission Title', id: '123456789ABC',
-      droneProvider: 'Drone Maniac', date: ' 10/24/2016  09:30 AM', location: 'Street address lorem...'},
+    {
+      routeImg: 'route-1.png',
+      missionTitle: 'Lorem Ipsum Mission Title',
+      id: '123456789ABC',
+      droneProvider: 'Drone Maniac',
+      date: ' 10/24/2016  09:30 AM',
+      location: 'Street address lorem...',
+    },
+    {
+      routeImg: 'route-1.png',
+      missionTitle: 'Lorem Ipsum Mission Title',
+      id: '123456789ABC',
+      droneProvider: 'Drone Maniac',
+      date: ' 10/24/2016  09:30 AM',
+      location: 'Street address lorem...',
+    },
+    {
+      routeImg: 'route-1.png',
+      missionTitle: 'Lorem Ipsum Mission Title',
+      id: '123456789ABC',
+      droneProvider: 'Drone Maniac',
+      date: ' 10/24/2016  09:30 AM',
+      location: 'Street address lorem...',
+    },
+    {
+      routeImg: 'route-1.png',
+      missionTitle: 'Lorem Ipsum Mission Title',
+      id: '123456789ABC',
+      droneProvider: 'Drone Maniac',
+      date: ' 10/24/2016  09:30 AM',
+      location: 'Street address lorem...',
+    },
   ],
 });
diff --git a/src/routes/MissionList/components/MissionListView.jsx b/src/routes/MissionList/components/MissionListView.jsx
index 7712b59..280e495 100644
--- a/src/routes/MissionList/components/MissionListView.jsx
+++ b/src/routes/MissionList/components/MissionListView.jsx
@@ -1,9 +1,9 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import { Link } from 'react-router';
+import {Link} from 'react-router';
 import styles from './MissionListView.scss';
 
-export const MissionListView = ({ missions, deleteMission }) => (
+export const MissionListView = ({missions, deleteMission}) => (
   <div styleName="mission-list-view">
     <div styleName="wrap">
       <div styleName="header">
@@ -27,7 +27,12 @@ export const MissionListView = ({ missions, deleteMission }) => (
                   <td styleName="td">{mission.missionName}</td>
                   <td styleName="td"><Link to={`/mission-planner/${mission.id}`}>Edit</Link></td>
                   <td styleName="td"><a href={mission.downloadLink} target="_blank" rel="noopener noreferrer">Download</a></td>
-                  <td styleName="td"><a href="#" onClick={(event) => { event.preventDefault(); deleteMission(mission.id); }}>Delete</a></td>
+                  <td styleName="td"><a
+                    href="#" onClick={(event) => {
+                      event.preventDefault();
+                      deleteMission(mission.id);
+                    }}
+                  >Delete</a></td>
                 </tr>
               ))}
             </tbody>
diff --git a/src/routes/MissionList/components/MissionListView.spec.jsx b/src/routes/MissionList/components/MissionListView.spec.jsx
index 8ed5cca..7f218a9 100644
--- a/src/routes/MissionList/components/MissionListView.spec.jsx
+++ b/src/routes/MissionList/components/MissionListView.spec.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { shallow } from 'enzyme';
+import {shallow} from 'enzyme';
 import _ from 'lodash';
-import { expect } from 'chai';
+import {expect} from 'chai';
 
 import MissionListView from './MissionListView';
 
@@ -23,7 +23,7 @@ const setup = () => {
 
 describe('MissionListView', () => {
   it('should have all props defined', () => {
-    const { enzymeWrapper } = setup();
+    const {enzymeWrapper} = setup();
 
     expect(enzymeWrapper.props().missions).to.be.defined;
     expect(enzymeWrapper.props().deleteMission).to.be.defined;
diff --git a/src/routes/MissionList/containers/MissionListContainer.js b/src/routes/MissionList/containers/MissionListContainer.js
index 3c5a5ee..543a6db 100644
--- a/src/routes/MissionList/containers/MissionListContainer.js
+++ b/src/routes/MissionList/containers/MissionListContainer.js
@@ -1,10 +1,10 @@
-import { asyncConnect } from 'redux-connect';
-import { actions } from '../modules/MissionList';
+import {asyncConnect} from 'redux-connect';
+import {actions} from '../modules/MissionList';
 
 import MissionListView from '../components/MissionListView';
 
 const resolve = [{
-  promise: ({ store }) => store.dispatch(actions.load()),
+  promise: ({store}) => store.dispatch(actions.load()),
 }];
 
 const mapState = (state) => state.missionList;
diff --git a/src/routes/MissionList/index.js b/src/routes/MissionList/index.js
index 8e10370..117a889 100644
--- a/src/routes/MissionList/index.js
+++ b/src/routes/MissionList/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'mission-list',
@@ -8,7 +8,7 @@ export default (store) => ({
       const MissionList = require('./containers/MissionListContainer').default;
       const reducer = require('./modules/MissionList').default;
 
-      injectReducer(store, { key: 'missionList', reducer });
+      injectReducer(store, {key: 'missionList', reducer});
       cb(null, MissionList);
     }, 'MissionList');
   },
diff --git a/src/routes/MissionList/modules/MissionList.js b/src/routes/MissionList/modules/MissionList.js
index 1146c59..3e594be 100644
--- a/src/routes/MissionList/modules/MissionList.js
+++ b/src/routes/MissionList/modules/MissionList.js
@@ -1,4 +1,4 @@
-import { handleActions } from 'redux-actions';
+import {handleActions} from 'redux-actions';
 import _ from 'lodash';
 import APIService from 'services/APIService';
 
@@ -13,13 +13,13 @@ export const DELETE_MISSION = 'MissionList/DELETE_MISSION';
 // ------------------------------------
 export const load = () => async(dispatch) => {
   const missions = await APIService.fetchMissionList();
-  dispatch({ type: LOADED, payload: { missions } });
+  dispatch({type: LOADED, payload: {missions}});
 };
 
 export const deleteMission = (id) => async(dispatch) => {
   await APIService.deleteMission(id);
 
-  dispatch({ type: DELETE_MISSION, payload: { missionId: id } });
+  dispatch({type: DELETE_MISSION, payload: {missionId: id}});
 };
 
 export const actions = {
@@ -31,8 +31,8 @@ export const actions = {
 // Reducer
 // ------------------------------------
 export default handleActions({
-  [LOADED]: (state, { payload: { missions } }) => ({ ...state, missions }),
-  [DELETE_MISSION]: (state, { payload: { missionId } }) => {
+  [LOADED]: (state, {payload: {missions}}) => ({...state, missions}),
+  [DELETE_MISSION]: (state, {payload: {missionId}}) => {
     const newState = _.cloneDeep(state);
 
     newState.missions = newState.missions.filter((mission) => mission.id !== missionId);
diff --git a/src/routes/MissionList/modules/MissionList.spec.js b/src/routes/MissionList/modules/MissionList.spec.js
index 1801a75..87313be 100644
--- a/src/routes/MissionList/modules/MissionList.spec.js
+++ b/src/routes/MissionList/modules/MissionList.spec.js
@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { expect } from 'chai';
+import {expect} from 'chai';
 
 import reducer, * as module from './MissionList';
 
@@ -26,7 +26,7 @@ describe('MissionList', () => {
   describe('reducer', () => {
     it('should return the initial state', () => {
       expect(
-        reducer(undefined, {})
+        reducer(null, {})
       ).to.deep.equal(
         _.cloneDeep(defaultState)
       );
@@ -35,21 +35,21 @@ describe('MissionList', () => {
     it('should handle LOADED', () => {
       const action = {
         type: module.LOADED,
-        payload: { missions: _.cloneDeep(missions) },
+        payload: {missions: _.cloneDeep(missions)},
       };
 
       expect(
         reducer({}, action)
       ).to.deep.equal(
-        { missions: _.cloneDeep(missions) }
+        {missions: _.cloneDeep(missions)}
       );
     });
 
     it('should handle DELETE_MISSION', () => {
-      const initialState = { missions: _.cloneDeep(missions) };
+      const initialState = {missions: _.cloneDeep(missions)};
       const action = {
         type: module.DELETE_MISSION,
-        payload: { missionId: '2' },
+        payload: {missionId: '2'},
       };
       const newState = _.cloneDeep(initialState);
       newState.missions.splice(1, 1);
diff --git a/src/routes/MissionPlanner/components/MissionMap/MissionMap.jsx b/src/routes/MissionPlanner/components/MissionMap/MissionMap.jsx
index ed653ae..bd0f50a 100644
--- a/src/routes/MissionPlanner/components/MissionMap/MissionMap.jsx
+++ b/src/routes/MissionPlanner/components/MissionMap/MissionMap.jsx
@@ -1,6 +1,6 @@
-import React, { PropTypes, Component } from 'react';
+import React, {PropTypes, Component} from 'react';
 import CSSModules from 'react-css-modules';
-import { withGoogleMap, GoogleMap, Marker, Polyline } from 'react-google-maps';
+import {withGoogleMap, GoogleMap, Marker, Polyline} from 'react-google-maps';
 import _ from 'lodash';
 import styles from './MissionMap.scss';
 
@@ -31,7 +31,7 @@ export const MissionGoogleMap = withGoogleMap((props) => (
     onClick={props.onMapClick}
   >
     {props.markers.map((marker, index) => (
-      <Marker {...marker} onDrag={(event) => props.onMarkerDrag(event, index)} />
+      <Marker key={index} {...marker} onDrag={(event) => props.onMarkerDrag(event, index)} />
     ))}
     <Polyline {...polylineConfig} path={props.lineMarkerPosistions} />
   </GoogleMap>
@@ -90,10 +90,10 @@ export class MissionMap extends Component {
       <div style={{height: '100%'}}>
         <MissionGoogleMap
           containerElement={
-            <div style={{ height: '100%' }} />
+            <div style={{height: '100%'}} />
           }
           mapElement={
-            <div style={{ height: '100%' }} />
+            <div style={{height: '100%'}} />
           }
           onMapLoad={this.handleMapLoad}
           onMapClick={this.props.onMapClick}
diff --git a/src/routes/MissionPlanner/components/MissionMap/MissionMap.spec.jsx b/src/routes/MissionPlanner/components/MissionMap/MissionMap.spec.jsx
index 4ab191a..9675b6a 100644
--- a/src/routes/MissionPlanner/components/MissionMap/MissionMap.spec.jsx
+++ b/src/routes/MissionPlanner/components/MissionMap/MissionMap.spec.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { shallow } from 'enzyme';
+import {shallow} from 'enzyme';
 import _ from 'lodash';
-import { expect } from 'chai';
+import {expect} from 'chai';
 
 import MissionMap from './MissionMap';
 
@@ -60,7 +60,7 @@ const setup = () => {
 
 describe('MissionMap', () => {
   it('should have all props defined', () => {
-    const { enzymeWrapper } = setup();
+    const {enzymeWrapper} = setup();
 
     expect(enzymeWrapper.props().markers).to.be.defined;
     expect(enzymeWrapper.props().onMapClick).to.be.defined;
diff --git a/src/routes/MissionPlanner/components/MissionPlannerHeader/MissionPlannerHeader.jsx b/src/routes/MissionPlanner/components/MissionPlannerHeader/MissionPlannerHeader.jsx
index ad2e6a2..862c426 100644
--- a/src/routes/MissionPlanner/components/MissionPlannerHeader/MissionPlannerHeader.jsx
+++ b/src/routes/MissionPlanner/components/MissionPlannerHeader/MissionPlannerHeader.jsx
@@ -1,7 +1,7 @@
-import React, { PropTypes, Component } from 'react';
+import React, {PropTypes, Component} from 'react';
 import CSSModules from 'react-css-modules';
-import { Link } from 'react-router';
-import { toastr } from 'react-redux-toastr';
+import {Link} from 'react-router';
+import {toastr} from 'react-redux-toastr';
 import TextField from 'components/TextField';
 import Button from 'components/Button';
 import styles from './MissionPlannerHeader.scss';
@@ -45,7 +45,7 @@ export class MissionPlannerHeader extends Component {
   }
 
   render() {
-    const { mission, save, clearMission, updateMissionName } = this.props;
+    const {mission, save, clearMission, updateMissionName} = this.props;
 
     return (
       <div styleName="mission-planner-header">
@@ -58,7 +58,9 @@ export class MissionPlannerHeader extends Component {
                 name="name"
                 placeholder="Enter mission name"
                 value={mission.missionName}
-                onChange={(event) => { updateMissionName(event.target.value); }}
+                onChange={(event) => {
+                  updateMissionName(event.target.value);
+                }}
               />
             </div>
             <Button
diff --git a/src/routes/MissionPlanner/components/MissionPlannerHeader/MissionPlannerHeader.spec.jsx b/src/routes/MissionPlanner/components/MissionPlannerHeader/MissionPlannerHeader.spec.jsx
index 0235632..25df69d 100644
--- a/src/routes/MissionPlanner/components/MissionPlannerHeader/MissionPlannerHeader.spec.jsx
+++ b/src/routes/MissionPlanner/components/MissionPlannerHeader/MissionPlannerHeader.spec.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { shallow } from 'enzyme';
+import {shallow} from 'enzyme';
 import _ from 'lodash';
-import { expect } from 'chai';
+import {expect} from 'chai';
 
 import MissionPlannerHeader from './MissionPlannerHeader';
 
@@ -127,7 +127,7 @@ const setup = () => {
 
 describe('MissionPlannerHeader', () => {
   it('should have all props defined', () => {
-    const { enzymeWrapper } = setup();
+    const {enzymeWrapper} = setup();
 
     expect(enzymeWrapper.props().mission).to.be.defined;
     expect(enzymeWrapper.props().save).to.be.defined;
diff --git a/src/routes/MissionPlanner/components/MissionPlannerView.jsx b/src/routes/MissionPlanner/components/MissionPlannerView.jsx
index 503100b..b888b12 100644
--- a/src/routes/MissionPlanner/components/MissionPlannerView.jsx
+++ b/src/routes/MissionPlanner/components/MissionPlannerView.jsx
@@ -22,7 +22,7 @@ export const getMissionItemsExt = (mission) => {
 export const getMarkerProps = (item, updateMissionItem) => {
   const markerProps = {
     key: item.uid,
-    position: { lat: item.coordinate[0], lng: item.coordinate[1] },
+    position: {lat: item.coordinate[0], lng: item.coordinate[1]},
     draggable: true,
     onDragEnd: (event) => {
       const newMissionItem = {
@@ -51,7 +51,7 @@ export const getMarkerProps = (item, updateMissionItem) => {
   // waypoint marker
   if (item.id > 1) {
     markerProps.icon = {
-      anchor: { x: 12, y: 12 },
+      anchor: {x: 12, y: 12},
       url: waypointIcon,
     };
     markerProps.label = {
@@ -64,7 +64,7 @@ export const getMarkerProps = (item, updateMissionItem) => {
   return markerProps;
 };
 
-export const MissionPlannerView = ({ mission, updateMissionItem, addMissionItem, deleteMissionItem }) => {
+export const MissionPlannerView = ({mission, updateMissionItem, addMissionItem, deleteMissionItem}) => {
   const missionItemsExt = getMissionItemsExt(mission);
   const markersExt = missionItemsExt.map((item) => getMarkerProps(item, updateMissionItem));
 
@@ -74,7 +74,7 @@ export const MissionPlannerView = ({ mission, updateMissionItem, addMissionItem,
         <MissionPlannerHeader />
       </div>
       <div styleName="map">
-        <MissionMap markers={markersExt} onMapClick={(event) => addMissionItem({ lat: event.latLng.lat(), lng: event.latLng.lng() })} />
+        <MissionMap markers={markersExt} onMapClick={(event) => addMissionItem({lat: event.latLng.lat(), lng: event.latLng.lng()})} />
         <MissionSidebar missionItems={missionItemsExt} onUpdate={updateMissionItem} onDelete={deleteMissionItem} />
       </div>
     </div>
diff --git a/src/routes/MissionPlanner/components/MissionPlannerView.spec.jsx b/src/routes/MissionPlanner/components/MissionPlannerView.spec.jsx
index f3b6767..4d925ae 100644
--- a/src/routes/MissionPlanner/components/MissionPlannerView.spec.jsx
+++ b/src/routes/MissionPlanner/components/MissionPlannerView.spec.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { shallow } from 'enzyme';
+import {shallow} from 'enzyme';
 import _ from 'lodash';
-import { expect } from 'chai';
+import {expect} from 'chai';
 
 import MissionPlannerView from './MissionPlannerView';
 import styles from './MissionPlannerView.scss';
@@ -128,14 +128,14 @@ const setup = () => {
 
 describe('MissionPlannerView', () => {
   it('should renders properly', () => {
-    const { enzymeWrapper } = setup();
+    const {enzymeWrapper} = setup();
 
     expect(enzymeWrapper.find(`.${styles.header}`)).to.have.length(1);
     expect(enzymeWrapper.find(`.${styles.map}`)).to.have.length(1);
   });
 
   it('should have all props defined', () => {
-    const { enzymeWrapper } = setup();
+    const {enzymeWrapper} = setup();
 
     expect(enzymeWrapper.props().mission).to.be.defined;
     expect(enzymeWrapper.props().updateMissionItem).to.be.defined;
diff --git a/src/routes/MissionPlanner/components/MissionSidebar/MissionSidebar.jsx b/src/routes/MissionPlanner/components/MissionSidebar/MissionSidebar.jsx
index 56af5ff..2fe4947 100644
--- a/src/routes/MissionPlanner/components/MissionSidebar/MissionSidebar.jsx
+++ b/src/routes/MissionPlanner/components/MissionSidebar/MissionSidebar.jsx
@@ -1,10 +1,10 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import _ from 'lodash';
 import MissionSidebarItem from '../MissionSidebarItem';
 import styles from './MissionSidebar.scss';
 
-export const MissionSidebar = ({ missionItems, onUpdate, onDelete }) => (
+export const MissionSidebar = ({missionItems, onUpdate, onDelete}) => (
   <div styleName="mission-sidebar">
     {missionItems.length ? (
         missionItems.map((missionItem) => (
diff --git a/src/routes/MissionPlanner/components/MissionSidebar/MissionSidebar.spec.jsx b/src/routes/MissionPlanner/components/MissionSidebar/MissionSidebar.spec.jsx
index 78f83d6..cf2b47d 100644
--- a/src/routes/MissionPlanner/components/MissionSidebar/MissionSidebar.spec.jsx
+++ b/src/routes/MissionPlanner/components/MissionSidebar/MissionSidebar.spec.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { shallow } from 'enzyme';
+import {shallow} from 'enzyme';
 import _ from 'lodash';
-import { expect } from 'chai';
+import {expect} from 'chai';
 
 import MissionSidebar from './MissionSidebar';
 
@@ -129,7 +129,7 @@ const setup = () => {
 
 describe('MissionSidebar', () => {
   it('should have all props defined', () => {
-    const { enzymeWrapper } = setup();
+    const {enzymeWrapper} = setup();
 
     expect(enzymeWrapper.props().missionItems).to.be.defined;
     expect(enzymeWrapper.props().onUpdate).to.be.defined;
diff --git a/src/routes/MissionPlanner/components/MissionSidebarItem/MissionSidebarItem.jsx b/src/routes/MissionPlanner/components/MissionSidebarItem/MissionSidebarItem.jsx
index c89ca3a..a374a94 100644
--- a/src/routes/MissionPlanner/components/MissionSidebarItem/MissionSidebarItem.jsx
+++ b/src/routes/MissionPlanner/components/MissionSidebarItem/MissionSidebarItem.jsx
@@ -1,6 +1,6 @@
-import React, { Component, PropTypes } from 'react';
+import React, {Component, PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import { Grid, Row, Col } from 'react-flexbox-grid/lib/index';
+import {Grid, Row, Col} from 'react-flexbox-grid/lib/index';
 import _ from 'lodash';
 import TextField from 'components/TextField';
 import Select from 'components/Select';
@@ -91,7 +91,7 @@ export class MissionSidebarItem extends Component {
 
   toggleFullBody() {
     const newState = this.state.fullBody === 'hidden' ? 'visible' : 'hidden';
-    this.setState({ fullBody: newState });
+    this.setState({fullBody: newState});
   }
 
   deleteSelf() {
diff --git a/src/routes/MissionPlanner/components/MissionSidebarItem/MissionSidebarItem.spec.jsx b/src/routes/MissionPlanner/components/MissionSidebarItem/MissionSidebarItem.spec.jsx
index 89081d7..217f4c0 100644
--- a/src/routes/MissionPlanner/components/MissionSidebarItem/MissionSidebarItem.spec.jsx
+++ b/src/routes/MissionPlanner/components/MissionSidebarItem/MissionSidebarItem.spec.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import { shallow } from 'enzyme';
+import {shallow} from 'enzyme';
 import _ from 'lodash';
-import { expect } from 'chai';
+import {expect} from 'chai';
 
 import MissionSidebarItem from './MissionSidebarItem';
 
@@ -36,7 +36,7 @@ const setup = () => {
 
 describe('MissionSidebarItem', () => {
   it('should have all props defined', () => {
-    const { enzymeWrapper } = setup();
+    const {enzymeWrapper} = setup();
 
     expect(enzymeWrapper.props().uid).to.be.defined;
     expect(enzymeWrapper.props().autoContinue).to.be.defined;
diff --git a/src/routes/MissionPlanner/containers/MissionPlannerContainer.js b/src/routes/MissionPlanner/containers/MissionPlannerContainer.js
index 73bfb88..0064c06 100644
--- a/src/routes/MissionPlanner/containers/MissionPlannerContainer.js
+++ b/src/routes/MissionPlanner/containers/MissionPlannerContainer.js
@@ -1,10 +1,10 @@
-import { asyncConnect } from 'redux-connect';
-import { actions } from '../modules/MissionPlanner';
+import {asyncConnect} from 'redux-connect';
+import {actions} from '../modules/MissionPlanner';
 
 import MissionPlannerView from '../components/MissionPlannerView';
 
 const resolve = [{
-  promise: ({ params, store }) => store.dispatch(actions.load(params.id)),
+  promise: ({params, store}) => store.dispatch(actions.load(params.id)),
 }];
 
 const mapState = (state) => state.missionPlanner;
diff --git a/src/routes/MissionPlanner/containers/MissionPlannerHeaderContainer.js b/src/routes/MissionPlanner/containers/MissionPlannerHeaderContainer.js
index 64b6eb6..b6a9cd3 100644
--- a/src/routes/MissionPlanner/containers/MissionPlannerHeaderContainer.js
+++ b/src/routes/MissionPlanner/containers/MissionPlannerHeaderContainer.js
@@ -1,10 +1,10 @@
-import { asyncConnect } from 'redux-connect';
-import { actions } from '../modules/MissionPlanner';
+import {asyncConnect} from 'redux-connect';
+import {actions} from '../modules/MissionPlanner';
 
 import MissionPlannerHeader from '../components/MissionPlannerHeader';
 
 const resolve = [{
-  promise: ({ params, store }) => store.dispatch(actions.load(params.id)),
+  promise: ({params, store}) => store.dispatch(actions.load(params.id)),
 }];
 
 const mapState = (state) => state.missionPlanner;
diff --git a/src/routes/MissionPlanner/index.js b/src/routes/MissionPlanner/index.js
index 8ac7b8f..f50f963 100644
--- a/src/routes/MissionPlanner/index.js
+++ b/src/routes/MissionPlanner/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'mission-planner(/:id)',
@@ -8,7 +8,7 @@ export default (store) => ({
       const MissionPlanner = require('./containers/MissionPlannerContainer').default;
       const reducer = require('./modules/MissionPlanner').default;
 
-      injectReducer(store, { key: 'missionPlanner', reducer });
+      injectReducer(store, {key: 'missionPlanner', reducer});
       cb(null, MissionPlanner);
     }, 'MissionPlanner');
   },
diff --git a/src/routes/MissionPlanner/modules/MissionPlanner.js b/src/routes/MissionPlanner/modules/MissionPlanner.js
index f7f4389..3161005 100644
--- a/src/routes/MissionPlanner/modules/MissionPlanner.js
+++ b/src/routes/MissionPlanner/modules/MissionPlanner.js
@@ -1,8 +1,8 @@
 import {handleActions} from 'redux-actions';
-import { push } from 'react-router-redux';
+import {push} from 'react-router-redux';
 import _ from 'lodash';
 import APIService from 'services/APIService';
-import { getUID, poluteMissionWithUID, cloneMissionUID, clearMissionUID } from './utils/missionUID.js';
+import {getUID, poluteMissionWithUID, cloneMissionUID, clearMissionUID} from './utils/missionUID.js';
 
 // ------------------------------------
 // Constants
@@ -36,7 +36,7 @@ export const load = (id) => async(dispatch) => {
     we will add custom unique ids to use them later as "key" property to prevent rerendering
   */
   mission = poluteMissionWithUID(mission);
-  dispatch({ type: LOADED, payload: { mission } });
+  dispatch({type: LOADED, payload: {mission}});
 };
 
 export const save = () => async (dispatch, getState) => {
@@ -61,16 +61,16 @@ export const save = () => async (dispatch, getState) => {
       but to prevent redrawing we copy uids
     */
     mission = cloneMissionUID(missionToSave, mission);
-    dispatch({ type: UPDATED, payload: { mission } });
+    dispatch({type: UPDATED, payload: {mission}});
   } else {
     await APIService.createMission(missionToSave);
-    dispatch({ type: CREATED });
+    dispatch({type: CREATED});
     dispatch(push('/mission-list'));
   }
 };
 
 export const updateMissionItem = (id, missionItem) => async (dispatch) => {
-  dispatch({ type: UPDATE_MISSION_ITEM, payload: { id, missionItem } });
+  dispatch({type: UPDATE_MISSION_ITEM, payload: {id, missionItem}});
 };
 
 export const addMissionItem = (markerPosition) => async (dispatch, getState) => {
@@ -80,19 +80,19 @@ export const addMissionItem = (markerPosition) => async (dispatch, getState) =>
   if (!getState().missionPlanner.mission.plannedHomePosition) {
     uids.push(getUID());
   }
-  dispatch({ type: ADD_MISSION_ITEM, payload: { markerPosition, uids } });
+  dispatch({type: ADD_MISSION_ITEM, payload: {markerPosition, uids}});
 };
 
 export const deleteMissionItem = (missionItemId) => async (dispatch) => {
-  dispatch({ type: DELETE_MISSION_ITEM, payload: { missionItemId } });
+  dispatch({type: DELETE_MISSION_ITEM, payload: {missionItemId}});
 };
 
 export const clearMission = () => async (dispatch) => {
-  dispatch({ type: CLEAR_MISSION });
+  dispatch({type: CLEAR_MISSION});
 };
 
 export const updateMissionName = (missionName) => async (dispatch) => {
-  dispatch({ type: UPDATE_MISSION_NAME, payload: { missionName } });
+  dispatch({type: UPDATE_MISSION_NAME, payload: {missionName}});
 };
 
 export const actions = {
@@ -109,21 +109,21 @@ export const actions = {
 // Reducer
 // ------------------------------------
 export default handleActions({
-  [LOADED]: (state, { payload: { mission } }) => {
+  [LOADED]: (state, {payload: {mission}}) => {
     const newState = _.cloneDeep(state);
 
     newState.mission = mission;
 
     return newState;
   },
-  [UPDATED]: (state, { payload: { mission } }) => {
+  [UPDATED]: (state, {payload: {mission}}) => {
     const newState = _.cloneDeep(state);
 
     newState.mission = mission;
 
     return newState;
   },
-  [UPDATE_MISSION_ITEM]: (state, {payload: {id, missionItem} }) => {
+  [UPDATE_MISSION_ITEM]: (state, {payload: {id, missionItem}}) => {
     const newState = _.cloneDeep(state);
 
     if (id === 0) {
@@ -133,7 +133,7 @@ export default handleActions({
     }
     return newState;
   },
-  [ADD_MISSION_ITEM]: (state, { payload: { markerPosition, uids } }) => {
+  [ADD_MISSION_ITEM]: (state, {payload: {markerPosition, uids}}) => {
     const newState = _.cloneDeep(state);
     const missionItem = {
       uid: uids[0], // use first uid
@@ -177,7 +177,7 @@ export default handleActions({
 
     return newState;
   },
-  [DELETE_MISSION_ITEM]: (state, { payload: { missionItemId } }) => {
+  [DELETE_MISSION_ITEM]: (state, {payload: {missionItemId}}) => {
     const newState = _.cloneDeep(state);
 
     // cannot delete home point, only missionItems
@@ -207,7 +207,7 @@ export default handleActions({
 
     return newState;
   },
-  [UPDATE_MISSION_NAME]: (state, { payload: { missionName } }) => {
+  [UPDATE_MISSION_NAME]: (state, {payload: {missionName}}) => {
     const newState = _.cloneDeep(state);
 
     newState.mission.missionName = missionName;
diff --git a/src/routes/MissionPlanner/modules/MissionPlanner.spec.js b/src/routes/MissionPlanner/modules/MissionPlanner.spec.js
index 16f228b..cfa9a21 100644
--- a/src/routes/MissionPlanner/modules/MissionPlanner.spec.js
+++ b/src/routes/MissionPlanner/modules/MissionPlanner.spec.js
@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { expect } from 'chai';
+import {expect} from 'chai';
 
 import reducer, * as module from './MissionPlanner';
 
@@ -183,7 +183,7 @@ describe('MissionPlanner', () => {
   describe('reducer', () => {
     it('should return the initial state', () => {
       expect(
-        reducer(undefined, {})
+        reducer(null, {})
       ).to.deep.equal(
         _.cloneDeep(defaultState)
       );
@@ -192,39 +192,39 @@ describe('MissionPlanner', () => {
     it('should handle LOADED', () => {
       const action = {
         type: module.LOADED,
-        payload: { mission: _.cloneDeep(mission) },
+        payload: {mission: _.cloneDeep(mission)},
       };
 
       expect(
         reducer({}, action)
       ).to.deep.equal(
-        { mission: _.cloneDeep(mission) }
+        {mission: _.cloneDeep(mission)}
       );
     });
 
     it('should handle UPDATED', () => {
       const action = {
         type: module.UPDATED,
-        payload: { mission: _.cloneDeep(mission) },
+        payload: {mission: _.cloneDeep(mission)},
       };
 
       expect(
         reducer({}, action)
       ).to.deep.equal(
-        { mission: _.cloneDeep(mission) }
+        {mission: _.cloneDeep(mission)}
       );
     });
 
     it('should handle UPDATE_MISSION_ITEM for missitonItem', () => {
-      const initialState = { mission: _.cloneDeep(mission) };
+      const initialState = {mission: _.cloneDeep(mission)};
       const action = {
         type: module.UPDATE_MISSION_ITEM,
-        payload: { id: 3, missionItem: _.cloneDeep(newMissionItem) },
+        payload: {id: 3, missionItem: _.cloneDeep(newMissionItem)},
       };
       const newMission = _.cloneDeep(mission);
       newMission.missionItems.splice(2, 1, _.cloneDeep(newMissionItem));
 
-      const newState = { mission: newMission };
+      const newState = {mission: newMission};
 
       expect(
         reducer(initialState, action)
@@ -234,15 +234,15 @@ describe('MissionPlanner', () => {
     });
 
     it('should handle UPDATE_MISSION_ITEM for plannedHomePosition', () => {
-      const initialState = { mission: _.cloneDeep(mission) };
+      const initialState = {mission: _.cloneDeep(mission)};
       const action = {
         type: module.UPDATE_MISSION_ITEM,
-        payload: { id: 0, missionItem: _.cloneDeep(newPlannedHomePosition) },
+        payload: {id: 0, missionItem: _.cloneDeep(newPlannedHomePosition)},
       };
       const newMission = _.cloneDeep(mission);
       newMission.plannedHomePosition = _.cloneDeep(newPlannedHomePosition);
 
-      const newState = { mission: newMission };
+      const newState = {mission: newMission};
 
       expect(
         reducer(initialState, action)
@@ -255,7 +255,7 @@ describe('MissionPlanner', () => {
       const initialState = _.cloneDeep(defaultState);
       const action = {
         type: module.ADD_MISSION_ITEM,
-        payload: { markerPosition: _.cloneDeep(newMarkerPosition), uids: ['missionitemnew', 'homepointnew'] },
+        payload: {markerPosition: _.cloneDeep(newMarkerPosition), uids: ['missionitemnew', 'homepointnew']},
       };
       const newMission = _.cloneDeep(defaultState).mission;
       newMission.plannedHomePosition = {
@@ -271,7 +271,7 @@ describe('MissionPlanner', () => {
         uid: 'missionitemnew',
       });
 
-      const newState = { mission: newMission };
+      const newState = {mission: newMission};
 
       expect(
         reducer(initialState, action)
@@ -285,7 +285,7 @@ describe('MissionPlanner', () => {
       initialState.mission.plannedHomePosition = newPlannedHomePosition;
       const action = {
         type: module.ADD_MISSION_ITEM,
-        payload: { markerPosition: _.cloneDeep(newMarkerPosition), uids: ['missionitemnew'] },
+        payload: {markerPosition: _.cloneDeep(newMarkerPosition), uids: ['missionitemnew']},
       };
       const newMission = _.cloneDeep(initialState).mission;
       newMission.missionItems.push({
@@ -296,7 +296,7 @@ describe('MissionPlanner', () => {
         uid: 'missionitemnew',
       });
 
-      const newState = { mission: newMission };
+      const newState = {mission: newMission};
 
       expect(
         reducer(initialState, action)
@@ -306,10 +306,10 @@ describe('MissionPlanner', () => {
     });
 
     it('should handle ADD_MISSION_ITEM for a mission with several points', () => {
-      const initialState = { mission: _.cloneDeep(mission) };
+      const initialState = {mission: _.cloneDeep(mission)};
       const action = {
         type: module.ADD_MISSION_ITEM,
-        payload: { markerPosition: _.cloneDeep(newMarkerPosition), uids: ['missionitemnew'] },
+        payload: {markerPosition: _.cloneDeep(newMarkerPosition), uids: ['missionitemnew']},
       };
       const newMission = _.cloneDeep(initialState).mission;
       newMission.missionItems.push({
@@ -319,7 +319,7 @@ describe('MissionPlanner', () => {
         uid: 'missionitemnew',
       });
 
-      const newState = { mission: newMission };
+      const newState = {mission: newMission};
 
       expect(
         reducer(initialState, action)
@@ -329,16 +329,16 @@ describe('MissionPlanner', () => {
     });
 
     it('should handle DELETE_MISSION_ITEM', () => {
-      const initialState = { mission: _.cloneDeep(mission) };
+      const initialState = {mission: _.cloneDeep(mission)};
       const action = {
         type: module.DELETE_MISSION_ITEM,
-        payload: { missionItemId: 3 },
+        payload: {missionItemId: 3},
       };
       const newMission = _.cloneDeep(initialState).mission;
       newMission.missionItems.splice(2, 1);
       newMission.missionItems = newMission.missionItems.map((item, index) => ({...item, id: index + 1}));
 
-      const newState = { mission: newMission };
+      const newState = {mission: newMission};
 
       expect(
         reducer(initialState, action)
@@ -348,16 +348,16 @@ describe('MissionPlanner', () => {
     });
 
     it('should handle CLEAR_MISSION', () => {
-      const initialState = { mission: _.cloneDeep(mission) };
+      const initialState = {mission: _.cloneDeep(mission)};
       const action = {
         type: module.CLEAR_MISSION,
-        payload: { missionItemId: 3 },
+        payload: {missionItemId: 3},
       };
       const newMission = _.cloneDeep(initialState).mission;
       newMission.plannedHomePosition = null;
       newMission.missionItems = [];
 
-      const newState = { mission: newMission };
+      const newState = {mission: newMission};
 
       expect(
         reducer(initialState, action)
@@ -367,15 +367,15 @@ describe('MissionPlanner', () => {
     });
 
     it('should handle UPDATE_MISSION_NAME', () => {
-      const initialState = { mission: _.cloneDeep(mission) };
+      const initialState = {mission: _.cloneDeep(mission)};
       const action = {
         type: module.UPDATE_MISSION_NAME,
-        payload: { missionName: newMissionName },
+        payload: {missionName: newMissionName},
       };
       const newMission = _.cloneDeep(initialState).mission;
       newMission.missionName = newMissionName;
 
-      const newState = { mission: newMission };
+      const newState = {mission: newMission};
 
       expect(
         reducer(initialState, action)
diff --git a/src/routes/MissionProgress/components/MissProgDetailContactRow/MissProgDetailContactRow.jsx b/src/routes/MissionProgress/components/MissProgDetailContactRow/MissProgDetailContactRow.jsx
index 1b23a48..32d398a 100644
--- a/src/routes/MissionProgress/components/MissProgDetailContactRow/MissProgDetailContactRow.jsx
+++ b/src/routes/MissionProgress/components/MissProgDetailContactRow/MissProgDetailContactRow.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './MissProgDetailContactRow.scss';
 import MissionProgressDetail from '../MissionProgressDetail';
diff --git a/src/routes/MissionProgress/components/MissProgDroneEstimateRow/MissProgDroneEstimateRow.jsx b/src/routes/MissionProgress/components/MissProgDroneEstimateRow/MissProgDroneEstimateRow.jsx
index c381dc7..d7d3485 100644
--- a/src/routes/MissionProgress/components/MissProgDroneEstimateRow/MissProgDroneEstimateRow.jsx
+++ b/src/routes/MissionProgress/components/MissProgDroneEstimateRow/MissProgDroneEstimateRow.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './MissProgDroneEstimateRow.scss';
 import MissionProgressDroneDetails from '../MissionProgressDroneDetails';
diff --git a/src/routes/MissionProgress/components/MissProgRouteCameraRow/MissProgRouteCameraRow.jsx b/src/routes/MissionProgress/components/MissProgRouteCameraRow/MissProgRouteCameraRow.jsx
index 9c42e90..e7f0fb1 100644
--- a/src/routes/MissionProgress/components/MissProgRouteCameraRow/MissProgRouteCameraRow.jsx
+++ b/src/routes/MissionProgress/components/MissProgRouteCameraRow/MissProgRouteCameraRow.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './MissProgRouteCameraRow.scss';
 import StatusDetailCamera from '../StatusDetailCamera';
diff --git a/src/routes/MissionProgress/components/MissionGallery/MissionGallery.jsx b/src/routes/MissionProgress/components/MissionGallery/MissionGallery.jsx
index df78dc1..304c72e 100644
--- a/src/routes/MissionProgress/components/MissionGallery/MissionGallery.jsx
+++ b/src/routes/MissionProgress/components/MissionGallery/MissionGallery.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './MissionGallery.scss';
 import MissionGallerySlides from '../MissionGallerySlides';
diff --git a/src/routes/MissionProgress/components/MissionGallerySlides/MissionGallerySlides.jsx b/src/routes/MissionProgress/components/MissionGallerySlides/MissionGallerySlides.jsx
index 0e8942e..3e635c0 100644
--- a/src/routes/MissionProgress/components/MissionGallerySlides/MissionGallerySlides.jsx
+++ b/src/routes/MissionProgress/components/MissionGallerySlides/MissionGallerySlides.jsx
@@ -1,41 +1,34 @@
-import React, { PropTypes, Component } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './MissionGallerySlides.scss';
+import Slider from 'react-slick';
 
-const Slider = require('react-slick');
 
 const getImage = (name) => `${window.location.origin}/img/slides/${name}`;
 
 
-/*
-* MissionGallerySlides
-*/
+const MissionGallerySlides = (props) => {
+  const settings = {
+    customPaging(i) {
+      return <div>{i}</div>;
+    },
+    dots: true,
+    infinite: true,
+    speed: 500,
+    slidesToShow: 4,
+    slidesToScroll: 4,
+    arrows: true,
+  };
+  const {missionSlides} = props;
+  return (
+    <div styleName="mission-gallery-slides">
+      <Slider {...settings}>
+        {missionSlides.map((slide, index) => <div key={index}><img src={getImage(slide.imagSrc)} alt="slide" /></div>)}
+      </Slider>
+    </div>
+  );
+};
 
-class MissionGallerySlides extends Component {
-  componentDidMount() {
-  }
-  render() {
-    const settings = {
-      customPaging(i) {
-        return <div>{i}</div>;
-      },
-      dots: true,
-      infinite: true,
-      speed: 500,
-      slidesToShow: 4,
-      slidesToScroll: 4,
-      arrows: true,
-    };
-    const { missionSlides } = this.props;
-    return (
-      <div styleName="mission-gallery-slides">
-        <Slider {...settings}>
-          {missionSlides.map((slide, index) => <div key={index}><img src={getImage(slide.imagSrc)} alt="slide" /></div>)}
-        </Slider>
-      </div>
-    );
-  }
-}
 
 MissionGallerySlides.propTypes = {
   missionSlides: PropTypes.array.isRequired,
diff --git a/src/routes/MissionProgress/components/MissionMarkAsModal/MissionMarkAsModal.jsx b/src/routes/MissionProgress/components/MissionMarkAsModal/MissionMarkAsModal.jsx
index 312c45a..cc98c15 100644
--- a/src/routes/MissionProgress/components/MissionMarkAsModal/MissionMarkAsModal.jsx
+++ b/src/routes/MissionProgress/components/MissionMarkAsModal/MissionMarkAsModal.jsx
@@ -1,10 +1,9 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import { Link } from 'react-router';
+import {Link} from 'react-router';
 import Button from 'components/Button';
 import styles from './MissionMarkAsModal.scss';
-
-const Modal = require('react-modal');
+import Modal from 'react-modal';
 
 
 /*
diff --git a/src/routes/MissionProgress/components/MissionProgressContact/MissionProgressContact.jsx b/src/routes/MissionProgress/components/MissionProgressContact/MissionProgressContact.jsx
index 402485f..b612a2a 100644
--- a/src/routes/MissionProgress/components/MissionProgressContact/MissionProgressContact.jsx
+++ b/src/routes/MissionProgress/components/MissionProgressContact/MissionProgressContact.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './MissionProgressContact.scss';
 
diff --git a/src/routes/MissionProgress/components/MissionProgressDetail/MissionProgressDetail.jsx b/src/routes/MissionProgress/components/MissionProgressDetail/MissionProgressDetail.jsx
index b2fab77..f82def9 100644
--- a/src/routes/MissionProgress/components/MissionProgressDetail/MissionProgressDetail.jsx
+++ b/src/routes/MissionProgress/components/MissionProgressDetail/MissionProgressDetail.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './MissionProgressDetail.scss';
 
diff --git a/src/routes/MissionProgress/components/MissionProgressDroneDetails/MissionProgressDroneDetails.jsx b/src/routes/MissionProgress/components/MissionProgressDroneDetails/MissionProgressDroneDetails.jsx
index bc9b418..5501eb7 100644
--- a/src/routes/MissionProgress/components/MissionProgressDroneDetails/MissionProgressDroneDetails.jsx
+++ b/src/routes/MissionProgress/components/MissionProgressDroneDetails/MissionProgressDroneDetails.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './MissionProgressDroneDetails.scss';
 
diff --git a/src/routes/MissionProgress/components/MissionProgressDroneEstimation/MissionProgressDroneEstimation.jsx b/src/routes/MissionProgress/components/MissionProgressDroneEstimation/MissionProgressDroneEstimation.jsx
index bcebc81..9e045ae 100644
--- a/src/routes/MissionProgress/components/MissionProgressDroneEstimation/MissionProgressDroneEstimation.jsx
+++ b/src/routes/MissionProgress/components/MissionProgressDroneEstimation/MissionProgressDroneEstimation.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import Button from 'components/Button';
 import styles from './MissionProgressDroneEstimation.scss';
diff --git a/src/routes/MissionProgress/components/MissionProgressHeader/MissionProgressHeader.jsx b/src/routes/MissionProgress/components/MissionProgressHeader/MissionProgressHeader.jsx
index ffc9f28..5b8848b 100644
--- a/src/routes/MissionProgress/components/MissionProgressHeader/MissionProgressHeader.jsx
+++ b/src/routes/MissionProgress/components/MissionProgressHeader/MissionProgressHeader.jsx
@@ -1,23 +1,22 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './MissionProgressHeader.scss';
 import MissionMarkAsModal from '../MissionMarkAsModal';
-
-const cn = require('classnames');
+import cn from 'classnames';
 
 
 /*
 * MissionProgressHeader
 */
 
-export const MissionProgressHeader = ({ statusName, handleStatus }) => (
+export const MissionProgressHeader = ({statusName, handleStatus}) => (
   <div styleName="mission-progress-header">
     <div styleName="title">Xtreme Food Delivery</div>
     {/* title end */}
     <div styleName="status">
       <span>STATUS</span>
-      <div styleName="current-status" className={cn({ completed: statusName === 'Completed' })}>
-        <i styleName="icon-progress" className={cn({ 'icon-completed': statusName === 'Completed' })} />
+      <div styleName="current-status" className={cn({completed: statusName === 'Completed'})}>
+        <i styleName="icon-progress" className={cn({'icon-completed': statusName === 'Completed'})} />
         {statusName}
       </div>
     </div>
diff --git a/src/routes/MissionProgress/components/ProviderMap/ProviderMap.jsx b/src/routes/MissionProgress/components/ProviderMap/ProviderMap.jsx
index c36ecbb..e3e8ab9 100644
--- a/src/routes/MissionProgress/components/ProviderMap/ProviderMap.jsx
+++ b/src/routes/MissionProgress/components/ProviderMap/ProviderMap.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import MapLegends from '../MapLegends';
 import styles from './ProviderMap.scss';
@@ -13,7 +13,7 @@ const getImage = (name) => `${window.location.origin}/img/${name}`;
 class ProviderMap extends React.Component {
 
   componentDidMount() {
-    const { doneCoords, wayPoints, statusName } = this.props;
+    const {doneCoords, wayPoints, statusName} = this.props;
 
     this.map = new google.maps.Map(this.node, {
       zoom: 16,
@@ -78,7 +78,7 @@ class ProviderMap extends React.Component {
     }
   }
 
-  shouldComponentUpdate() {
+  shouldComponentUpdate() { // eslint-disable-line lodash/prefer-constant
     // the whole logic is handled by google plugin
     return false;
   }
diff --git a/src/routes/MissionProgress/components/StatusDetailCamera/StatusDetailCamera.jsx b/src/routes/MissionProgress/components/StatusDetailCamera/StatusDetailCamera.jsx
index a9a114e..feb3fff 100644
--- a/src/routes/MissionProgress/components/StatusDetailCamera/StatusDetailCamera.jsx
+++ b/src/routes/MissionProgress/components/StatusDetailCamera/StatusDetailCamera.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './StatusDetailCamera.scss';
 
diff --git a/src/routes/MissionProgress/containers/MissProgDetailContactContainer.js b/src/routes/MissionProgress/containers/MissProgDetailContactContainer.js
index bc7957c..9e49b29 100644
--- a/src/routes/MissionProgress/containers/MissProgDetailContactContainer.js
+++ b/src/routes/MissionProgress/containers/MissProgDetailContactContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import {actions} from '../modules/MissionProgress';
 
 import MissProgDetailContactRow from '../components/MissProgDetailContactRow';
diff --git a/src/routes/MissionProgress/containers/MissProgDroneEstimateContainer.js b/src/routes/MissionProgress/containers/MissProgDroneEstimateContainer.js
index 440f9d1..088d14d 100644
--- a/src/routes/MissionProgress/containers/MissProgDroneEstimateContainer.js
+++ b/src/routes/MissionProgress/containers/MissProgDroneEstimateContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import {actions} from '../modules/MissionProgress';
 
 import MissProgDroneEstimateRow from '../components/MissProgDroneEstimateRow';
diff --git a/src/routes/MissionProgress/containers/MissProgRouteCameraContainer.js b/src/routes/MissionProgress/containers/MissProgRouteCameraContainer.js
index 0cb4f93..c4ed79a 100644
--- a/src/routes/MissionProgress/containers/MissProgRouteCameraContainer.js
+++ b/src/routes/MissionProgress/containers/MissProgRouteCameraContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import {actions} from '../modules/MissionProgress';
 
 import MissProgRouteCameraRow from '../components/MissProgRouteCameraRow';
diff --git a/src/routes/MissionProgress/containers/MissionGalleryContainer.js b/src/routes/MissionProgress/containers/MissionGalleryContainer.js
index 5bba429..74bbacf 100644
--- a/src/routes/MissionProgress/containers/MissionGalleryContainer.js
+++ b/src/routes/MissionProgress/containers/MissionGalleryContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import MissionGallery from '../components/MissionGallery';
 
 const mapState = (state) => state.missionProgress;
diff --git a/src/routes/MissionProgress/containers/MissionProgressContainer.js b/src/routes/MissionProgress/containers/MissionProgressContainer.js
index df3bdab..e05dcd1 100644
--- a/src/routes/MissionProgress/containers/MissionProgressContainer.js
+++ b/src/routes/MissionProgress/containers/MissionProgressContainer.js
@@ -1,4 +1,4 @@
-import { asyncConnect } from 'redux-connect';
+import {asyncConnect} from 'redux-connect';
 import {actions} from '../modules/MissionProgress';
 
 import MissionProgressView from '../components/MissionProgressView';
diff --git a/src/routes/MissionProgress/containers/MissionProgressHeaderContainer.js b/src/routes/MissionProgress/containers/MissionProgressHeaderContainer.js
index 1b96917..f9aa81c 100644
--- a/src/routes/MissionProgress/containers/MissionProgressHeaderContainer.js
+++ b/src/routes/MissionProgress/containers/MissionProgressHeaderContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import {markAsComplete} from '../modules/MissionProgress';
 
 import MissionProgressHeader from '../components/MissionProgressHeader';
diff --git a/src/routes/MissionProgress/containers/ProviderMapContainer.js b/src/routes/MissionProgress/containers/ProviderMapContainer.js
index 97a0089..48591be 100644
--- a/src/routes/MissionProgress/containers/ProviderMapContainer.js
+++ b/src/routes/MissionProgress/containers/ProviderMapContainer.js
@@ -1,6 +1,6 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import ProviderMap from '../components/ProviderMap';
-import { actions } from '../modules/MissionProgress';
+import {actions} from '../modules/MissionProgress';
 
 const mapState = (state) => state.missionProgress;
 
diff --git a/src/routes/MissionProgress/index.js b/src/routes/MissionProgress/index.js
index 18aba86..8acbbe2 100644
--- a/src/routes/MissionProgress/index.js
+++ b/src/routes/MissionProgress/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'mission-progress',
@@ -9,7 +9,7 @@ export default (store) => ({
       const MissionProgress = require('./containers/MissionProgressContainer').default;
       const reducer = require('./modules/MissionProgress').default;
 
-      injectReducer(store, { key: 'missionProgress', reducer });
+      injectReducer(store, {key: 'missionProgress', reducer});
       cb(null, MissionProgress);
     }, 'MissionProgress');
   },
diff --git a/src/routes/MissionProgress/modules/MissionProgress.js b/src/routes/MissionProgress/modules/MissionProgress.js
index 9a40b36..ebb402a 100644
--- a/src/routes/MissionProgress/modules/MissionProgress.js
+++ b/src/routes/MissionProgress/modules/MissionProgress.js
@@ -1,4 +1,4 @@
-import { handleActions, createAction } from 'redux-actions';
+import {handleActions, createAction} from 'redux-actions';
 
 
 // ------------------------------------
diff --git a/src/routes/MyDrone/components/MyDronesTable/MyDronesTable.jsx b/src/routes/MyDrone/components/MyDronesTable/MyDronesTable.jsx
index e16092a..f7972bd 100644
--- a/src/routes/MyDrone/components/MyDronesTable/MyDronesTable.jsx
+++ b/src/routes/MyDrone/components/MyDronesTable/MyDronesTable.jsx
@@ -1,5 +1,5 @@
-import React, { PropTypes, Component } from 'react';
-import Reactable from 'Reactable';
+import React, {PropTypes, Component} from 'react';
+import Reactable from 'reactable';
 import CSSModules from 'react-css-modules';
 import Dropdown from 'react-dropdown';
 import styles from './MyDronesTable.scss';
@@ -15,17 +15,17 @@ class MyDronesTable extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      selected: { value: 10, label: '10' },
+      selected: {value: 10, label: '10'},
     };
   }
 
   render() {
-    const { tableData, itemPerPage, items, displayingHandle, displaying } = this.props;
+    const {tableData, itemPerPage, items, displayingHandle, displaying} = this.props;
     let currentPageNum = 0;
     const options = [
-      { value: 10, label: '10' },
-      { value: 15, label: '15' },
-      { value: 20, label: '20' },
+      {value: 10, label: '10'},
+      {value: 15, label: '15'},
+      {value: 20, label: '20'},
     ];
 
     function calcuDisplaying(perPage, pageNum) {
diff --git a/src/routes/MyDrone/components/MyDronesTabs/MyDronesTabs.jsx b/src/routes/MyDrone/components/MyDronesTabs/MyDronesTabs.jsx
index 5303e99..e1ef7bd 100644
--- a/src/routes/MyDrone/components/MyDronesTabs/MyDronesTabs.jsx
+++ b/src/routes/MyDrone/components/MyDronesTabs/MyDronesTabs.jsx
@@ -1,6 +1,6 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import { Tab, Tabs, TabList, TabPanel } from 'react-tabs';
+import {Tab, Tabs, TabList, TabPanel} from 'react-tabs';
 import styles from './MyDronesTabs.scss';
 import MyDronesTable from '../MyDronesTable';
 
diff --git a/src/routes/MyDrone/components/ProviderMap/ProviderMap.jsx b/src/routes/MyDrone/components/ProviderMap/ProviderMap.jsx
index 3827ca3..30df989 100644
--- a/src/routes/MyDrone/components/ProviderMap/ProviderMap.jsx
+++ b/src/routes/MyDrone/components/ProviderMap/ProviderMap.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import MapLegends from '../MapLegends';
 import styles from './ProviderMap.scss';
@@ -13,7 +13,7 @@ const getImage = (name) => `${window.location.origin}/img/${name}`;
 class ProviderMap extends React.Component {
 
   componentDidMount() {
-    const { myDrons } = this.props;
+    const {myDrons} = this.props;
 
     this.map = new google.maps.Map(this.node, {
       zoom: 7,
@@ -60,7 +60,7 @@ class ProviderMap extends React.Component {
     });
   }
 
-  shouldComponentUpdate() {
+  shouldComponentUpdate() { // eslint-disable-line lodash/prefer-constant
     // the whole logic is handled by google plugin
     return false;
   }
diff --git a/src/routes/MyDrone/containers/MyDroneContainer.js b/src/routes/MyDrone/containers/MyDroneContainer.js
index d6379d4..92d5f83 100644
--- a/src/routes/MyDrone/containers/MyDroneContainer.js
+++ b/src/routes/MyDrone/containers/MyDroneContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import MyDroneView from '../components/MyDroneView';
 
 const mapState = (state) => state.myDrone;
diff --git a/src/routes/MyDrone/containers/MyDronesTabsContainer.js b/src/routes/MyDrone/containers/MyDronesTabsContainer.js
index dad3ecd..5403c48 100644
--- a/src/routes/MyDrone/containers/MyDronesTabsContainer.js
+++ b/src/routes/MyDrone/containers/MyDronesTabsContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import MyDronesTabs from '../components/MyDronesTabs';
 import {itemPerPageAction, displayedRowsAction} from '../modules/MyDrone';
 
diff --git a/src/routes/MyDrone/containers/ProviderMapContainer.js b/src/routes/MyDrone/containers/ProviderMapContainer.js
index 95f4c88..18da04e 100644
--- a/src/routes/MyDrone/containers/ProviderMapContainer.js
+++ b/src/routes/MyDrone/containers/ProviderMapContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import ProviderMap from '../components/ProviderMap';
 
 const mapState = (state) => state.myDrone;
diff --git a/src/routes/MyDrone/index.js b/src/routes/MyDrone/index.js
index 0d60d49..ee9a096 100644
--- a/src/routes/MyDrone/index.js
+++ b/src/routes/MyDrone/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'my-drone',
@@ -9,7 +9,7 @@ export default (store) => ({
       const MyDrone = require('./containers/MyDroneContainer').default;
       const reducer = require('./modules/MyDrone').default;
 
-      injectReducer(store, { key: 'myDrone', reducer });
+      injectReducer(store, {key: 'myDrone', reducer});
       cb(null, MyDrone);
     }, 'MyDrone');
   },
diff --git a/src/routes/MyDrone/modules/MyDrone.js b/src/routes/MyDrone/modules/MyDrone.js
index cb24dd7..2ab9a65 100644
--- a/src/routes/MyDrone/modules/MyDrone.js
+++ b/src/routes/MyDrone/modules/MyDrone.js
@@ -1,5 +1,5 @@
-import { handleActions, createAction } from 'redux-actions';
-import Reactable from 'Reactable';
+import {handleActions, createAction} from 'redux-actions';
+import Reactable from 'reactable';
 
 const unsafe = Reactable.unsafe;
 
@@ -53,8 +53,8 @@ export default handleActions({
   }),
 }, {
   // initial data
-  items: { value: 10, label: '10' },
-  displaying: {start: 1, end: 10, currentPage: 0 },
+  items: {value: 10, label: '10'},
+  displaying: {start: 1, end: 10, currentPage: 0},
   myDrons: [
     {
       lat: -6.195168,
@@ -93,99 +93,99 @@ export default handleActions({
     },
   ],
   availableDrones: [
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type gorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type corem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type xorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type sorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type worem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type iorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type korem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type rorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type morem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type gorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type corem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type xorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type sorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type worem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type iorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type korem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type rorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type morem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type gorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type corem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type xorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type sorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type worem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type iorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type korem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type rorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type morem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type gorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type corem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type xorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type sorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type worem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type iorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type korem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type rorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type morem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type gorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type corem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type xorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type sorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type worem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type iorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type korem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type rorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type morem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type gorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type corem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type xorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type sorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type worem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type iorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type korem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type rorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type morem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type gorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type corem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type xorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type sorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type worem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type iorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type korem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type rorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type morem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type gorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type corem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type xorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type sorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type worem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type lorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-2.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type iorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type korem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type rorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type morem', Mileage: '999.99 miles', '': unsafe(rowActions)},
 
   ],
   onMissionDrones: [
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type korem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type rorem', Mileage: '999.99 miles', '': unsafe(rowActions) },
-    { Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type morem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-1.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type korem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-3.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type rorem', Mileage: '999.99 miles', '': unsafe(rowActions)},
+    {Image: unsafe(`<img src="https://github.com/$%7BgetImage()%7DmyDrones/my-drone-4.png"/>`), 'Drone Serial Number': '123456789ABC', 'Drone Name': 'Drone name lorem ipsum', 'Drone Type': 'Drone type morem', Mileage: '999.99 miles', '': unsafe(rowActions)},
   ],
 });
diff --git a/src/routes/MyRequest/components/MyRequestFilter/MyRequestFilter.jsx b/src/routes/MyRequest/components/MyRequestFilter/MyRequestFilter.jsx
index ea04781..cc74706 100644
--- a/src/routes/MyRequest/components/MyRequestFilter/MyRequestFilter.jsx
+++ b/src/routes/MyRequest/components/MyRequestFilter/MyRequestFilter.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './MyRequestFilter.scss';
 
diff --git a/src/routes/MyRequest/components/MyRequestItems/MyRequestItems.jsx b/src/routes/MyRequest/components/MyRequestItems/MyRequestItems.jsx
index c1b3873..b143dfb 100644
--- a/src/routes/MyRequest/components/MyRequestItems/MyRequestItems.jsx
+++ b/src/routes/MyRequest/components/MyRequestItems/MyRequestItems.jsx
@@ -1,5 +1,6 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
+import _ from 'lodash';
 import styles from './MyRequestItems.scss';
 import RequestItem from '../RequestItem';
 
@@ -14,7 +15,7 @@ class MyRequestItems extends React.Component {
   }
 
   _toggleDetail(i) {
-    if (this.state.openedItems.indexOf(i) === -1) {
+    if (_.includes(this.state.openedItems, i)) {
       this.state.openedItems.push(i);
     } else {
       this.state.openedItems.splice(this.state.openedItems.indexOf(i), 1);
@@ -26,7 +27,7 @@ class MyRequestItems extends React.Component {
     return (
       <ul>
         {this.props.requestItems.map((requestItem, i) => (
-          <RequestItem isOpen={this.state.openedItems.indexOf(i) > -1} _toggleDetail={this._toggleDetail.bind(this)} key={i} index={i} requestItem={requestItem} />
+          <RequestItem isOpen={_.includes(this.state.openedItems, i)} _toggleDetail={this._toggleDetail.bind(this)} key={i} index={i} requestItem={requestItem} />
         ))}
       </ul>
     );
diff --git a/src/routes/MyRequest/components/RequestDetails/RequestDetails.jsx b/src/routes/MyRequest/components/RequestDetails/RequestDetails.jsx
index aa260f5..f110b6b 100644
--- a/src/routes/MyRequest/components/RequestDetails/RequestDetails.jsx
+++ b/src/routes/MyRequest/components/RequestDetails/RequestDetails.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './RequestDetails.scss';
 import RequestMapContainer from '../../containers/RequestMapContainer';
diff --git a/src/routes/MyRequest/components/RequestItem/RequestItem.jsx b/src/routes/MyRequest/components/RequestItem/RequestItem.jsx
index b0d77bf..cf2f133 100644
--- a/src/routes/MyRequest/components/RequestItem/RequestItem.jsx
+++ b/src/routes/MyRequest/components/RequestItem/RequestItem.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './RequestItem.scss';
 import RequestItemControls from '../RequestItemControls';
diff --git a/src/routes/MyRequest/components/RequestItemControls/RequestItemControls.jsx b/src/routes/MyRequest/components/RequestItemControls/RequestItemControls.jsx
index e48e221..eedc14c 100644
--- a/src/routes/MyRequest/components/RequestItemControls/RequestItemControls.jsx
+++ b/src/routes/MyRequest/components/RequestItemControls/RequestItemControls.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './RequestItemControls.scss';
 
diff --git a/src/routes/MyRequest/components/RequestMap/RequestMap.jsx b/src/routes/MyRequest/components/RequestMap/RequestMap.jsx
index f8a705b..520d5b5 100644
--- a/src/routes/MyRequest/components/RequestMap/RequestMap.jsx
+++ b/src/routes/MyRequest/components/RequestMap/RequestMap.jsx
@@ -14,7 +14,7 @@ class RequestMap extends React.Component {
     });
   }
 
-  shouldComponentUpdate() {
+  shouldComponentUpdate() { // eslint-disable-line lodash/prefer-constant
     // the whole logic is handled by google plugin
     return false;
   }
diff --git a/src/routes/MyRequest/containers/MyRequestContainer.js b/src/routes/MyRequest/containers/MyRequestContainer.js
index 74757ea..645c5be 100644
--- a/src/routes/MyRequest/containers/MyRequestContainer.js
+++ b/src/routes/MyRequest/containers/MyRequestContainer.js
@@ -1,4 +1,4 @@
-import { asyncConnect } from 'redux-connect';
+import {asyncConnect} from 'redux-connect';
 import {actions} from '../modules/MyRequest';
 
 import MyRequestView from '../components/MyRequestView';
diff --git a/src/routes/MyRequest/containers/MyRequestItemsContainer.js b/src/routes/MyRequest/containers/MyRequestItemsContainer.js
index a25f402..5f732f2 100644
--- a/src/routes/MyRequest/containers/MyRequestItemsContainer.js
+++ b/src/routes/MyRequest/containers/MyRequestItemsContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import MyRequestItems from '../components/MyRequestItems';
 
 const mapState = (state) => state.myRequest;
diff --git a/src/routes/MyRequest/containers/RequestMapContainer.js b/src/routes/MyRequest/containers/RequestMapContainer.js
index a65cec3..4bf1fa8 100644
--- a/src/routes/MyRequest/containers/RequestMapContainer.js
+++ b/src/routes/MyRequest/containers/RequestMapContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import RequestMap from '../components/RequestMap';
 
 const mapState = (state) => state.myRequest;
diff --git a/src/routes/MyRequest/index.js b/src/routes/MyRequest/index.js
index 9eea462..835b115 100644
--- a/src/routes/MyRequest/index.js
+++ b/src/routes/MyRequest/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'my-request',
@@ -9,7 +9,7 @@ export default (store) => ({
       const MyRequest = require('./containers/MyRequestContainer').default;
       const reducer = require('./modules/MyRequest').default;
 
-      injectReducer(store, { key: 'myRequest', reducer });
+      injectReducer(store, {key: 'myRequest', reducer});
       cb(null, MyRequest);
     }, 'MyRequest');
   },
diff --git a/src/routes/MyRequest/modules/MyRequest.js b/src/routes/MyRequest/modules/MyRequest.js
index 7fe4840..e178900 100644
--- a/src/routes/MyRequest/modules/MyRequest.js
+++ b/src/routes/MyRequest/modules/MyRequest.js
@@ -1,4 +1,4 @@
-import { handleActions } from 'redux-actions';
+import {handleActions} from 'redux-actions';
 
 // ------------------------------------
 // Actions
diff --git a/src/routes/MyRequestStatus/components/MyRequestHeader/MyRequestHeader.jsx b/src/routes/MyRequestStatus/components/MyRequestHeader/MyRequestHeader.jsx
index a1e16f5..6625f1c 100644
--- a/src/routes/MyRequestStatus/components/MyRequestHeader/MyRequestHeader.jsx
+++ b/src/routes/MyRequestStatus/components/MyRequestHeader/MyRequestHeader.jsx
@@ -1,17 +1,17 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import SelectDropdown from 'components/SelectDropdown';
 import styles from './MyRequestHeader.scss';
 
-export const MyRequestHeader = ({ onStatusChange, statusValue }) => (
+export const MyRequestHeader = ({onStatusChange, statusValue}) => (
   <div styleName="my-request-header">
     <h1 styleName="title">My Request Status</h1>
     <SelectDropdown
       options={[
-        { value: 'all', label: 'Show all requests' },
-        { value: 'inProgress', label: 'Show In Progress' },
-        { value: 'cancelled', label: 'Show Cancelled' },
-        { value: 'completed', label: 'Show Completed' },
+        {value: 'all', label: 'Show all requests'},
+        {value: 'inProgress', label: 'Show In Progress'},
+        {value: 'cancelled', label: 'Show Cancelled'},
+        {value: 'completed', label: 'Show Completed'},
       ]}
       value={statusValue}
       onChange={onStatusChange}
diff --git a/src/routes/MyRequestStatus/components/MyRequestStatusView.jsx b/src/routes/MyRequestStatus/components/MyRequestStatusView.jsx
index af1acaf..b88ccfd 100644
--- a/src/routes/MyRequestStatus/components/MyRequestStatusView.jsx
+++ b/src/routes/MyRequestStatus/components/MyRequestStatusView.jsx
@@ -1,16 +1,16 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import Breadcrumb from 'components/Breadcrumb';
 import MyRequestHeader from './MyRequestHeader';
 import MyRequestTable from './MyRequestTable';
 import styles from './MyRequestStatusView.scss';
 
-export const MyRequestStatusView = ({ requests, load, filterByStatus }) => (
+export const MyRequestStatusView = ({requests, load, filterByStatus}) => (
   <div styleName="my-request-status-view">
     <Breadcrumb
       items={[
-        { text: 'Profile', path: '/' },
-        { text: 'My Request Status' },
+        {text: 'Profile', path: '/'},
+        {text: 'My Request Status'},
       ]}
     />
     <div styleName="wrap">
diff --git a/src/routes/MyRequestStatus/components/MyRequestTable/MyRequestTable.jsx b/src/routes/MyRequestStatus/components/MyRequestTable/MyRequestTable.jsx
index 4293174..9000887 100644
--- a/src/routes/MyRequestStatus/components/MyRequestTable/MyRequestTable.jsx
+++ b/src/routes/MyRequestStatus/components/MyRequestTable/MyRequestTable.jsx
@@ -1,11 +1,11 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import dateFormat from 'dateformat';
 import StatusLabel from 'components/StatusLabel';
-import { Link } from 'react-router';
+import {Link} from 'react-router';
 import styles from './MyRequestTable.scss';
 
-export const MyRequestTable = ({ requests }) => (
+export const MyRequestTable = ({requests}) => (
   <table styleName="my-request-table">
     <thead styleName="thead">
       <tr>
diff --git a/src/routes/MyRequestStatus/containers/MyRequestStatusContainer.js b/src/routes/MyRequestStatus/containers/MyRequestStatusContainer.js
index 1e454cb..80b9377 100644
--- a/src/routes/MyRequestStatus/containers/MyRequestStatusContainer.js
+++ b/src/routes/MyRequestStatus/containers/MyRequestStatusContainer.js
@@ -1,10 +1,10 @@
-import { asyncConnect } from 'redux-connect';
-import { actions } from '../modules/MyRequestStatus';
+import {asyncConnect} from 'redux-connect';
+import {actions} from '../modules/MyRequestStatus';
 
 import MyRequestStatusView from '../components/MyRequestStatusView';
 
 const resolve = [{
-  promise: ({ store }) => store.dispatch(actions.load()),
+  promise: ({store}) => store.dispatch(actions.load()),
 }];
 
 const mapState = (state) => state.myRequestStatus;
diff --git a/src/routes/MyRequestStatus/index.js b/src/routes/MyRequestStatus/index.js
index d4d23a0..d0eb119 100644
--- a/src/routes/MyRequestStatus/index.js
+++ b/src/routes/MyRequestStatus/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'my-request-status',
@@ -8,7 +8,7 @@ export default (store) => ({
       const MyRequestStatus = require('./containers/MyRequestStatusContainer').default;
       const reducer = require('./modules/MyRequestStatus').default;
 
-      injectReducer(store, { key: 'myRequestStatus', reducer });
+      injectReducer(store, {key: 'myRequestStatus', reducer});
       cb(null, MyRequestStatus);
     }, 'MyRequestStatus');
   },
diff --git a/src/routes/MyRequestStatus/modules/MyRequestStatus.js b/src/routes/MyRequestStatus/modules/MyRequestStatus.js
index 7765eed..f397bdc 100644
--- a/src/routes/MyRequestStatus/modules/MyRequestStatus.js
+++ b/src/routes/MyRequestStatus/modules/MyRequestStatus.js
@@ -1,4 +1,4 @@
-import { handleActions } from 'redux-actions';
+import {handleActions} from 'redux-actions';
 import APIService from 'services/APIService';
 
 // ------------------------------------
@@ -12,7 +12,7 @@ export const LOADED = 'MyRequestStatus/LOADED';
 export const load = (filterByStatus = 'all') => async(dispatch) => {
   const requests = await APIService.fetchMyRequestStatus(filterByStatus);
 
-  dispatch({ type: LOADED, payload: { requests, filterByStatus } });
+  dispatch({type: LOADED, payload: {requests, filterByStatus}});
 };
 
 export const actions = {
@@ -23,7 +23,7 @@ export const actions = {
 // Reducer
 // ------------------------------------
 export default handleActions({
-  [LOADED]: (state, { payload: { requests, filterByStatus } }) => ({ ...state, requests, filterByStatus }),
+  [LOADED]: (state, {payload: {requests, filterByStatus}}) => ({...state, requests, filterByStatus}),
 }, {
   filterByStatus: 'all',
 });
diff --git a/src/routes/MyServices/components/MyServicesHeader/MyServicesHeader.jsx b/src/routes/MyServices/components/MyServicesHeader/MyServicesHeader.jsx
index f4ee857..4fc390a 100644
--- a/src/routes/MyServices/components/MyServicesHeader/MyServicesHeader.jsx
+++ b/src/routes/MyServices/components/MyServicesHeader/MyServicesHeader.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import CSSModules from 'react-css-modules';
 import Button from 'components/Button';
-import { Link } from 'react-router';
+import {Link} from 'react-router';
 import styles from './MyServicesHeader.scss';
 
 
diff --git a/src/routes/MyServices/components/MyServicesTable/MyServicesTable.jsx b/src/routes/MyServices/components/MyServicesTable/MyServicesTable.jsx
index 95f015d..c52c2a1 100644
--- a/src/routes/MyServices/components/MyServicesTable/MyServicesTable.jsx
+++ b/src/routes/MyServices/components/MyServicesTable/MyServicesTable.jsx
@@ -1,5 +1,5 @@
-import React, { PropTypes, Component } from 'react';
-import Reactable from 'Reactable';
+import React, {PropTypes, Component} from 'react';
+import Reactable from 'reactable';
 import CSSModules from 'react-css-modules';
 import Dropdown from 'react-dropdown';
 import styles from './MyServicesTable.scss';
@@ -15,17 +15,17 @@ class MyServicesTable extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      selected: { value: 10, label: '10' },
+      selected: {value: 10, label: '10'},
     };
   }
 
   render() {
-    const { servicesTableData, itemPerPage, items, displayingHandle, displaying } = this.props;
+    const {servicesTableData, itemPerPage, items, displayingHandle, displaying} = this.props;
     let currentPageNum = 0;
     const options = [
-      { value: 10, label: '10' },
-      { value: 15, label: '15' },
-      { value: 20, label: '20' },
+      {value: 10, label: '10'},
+      {value: 15, label: '15'},
+      {value: 20, label: '20'},
     ];
 
     function calcuDisplaying(perPage, pageNum) {
diff --git a/src/routes/MyServices/containers/MyServicesContainer.js b/src/routes/MyServices/containers/MyServicesContainer.js
index 11e24c6..281bf22 100644
--- a/src/routes/MyServices/containers/MyServicesContainer.js
+++ b/src/routes/MyServices/containers/MyServicesContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import MyServicesView from '../components/MyServicesView';
 
 const mapState = (state) => state.myServices;
diff --git a/src/routes/MyServices/containers/MyServicesTableContainer.js b/src/routes/MyServices/containers/MyServicesTableContainer.js
index bede997..793eb5b 100644
--- a/src/routes/MyServices/containers/MyServicesTableContainer.js
+++ b/src/routes/MyServices/containers/MyServicesTableContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import MyServicesTable from '../components/MyServicesTable';
 import {itemPerPageAction, displayedRowsAction} from '../modules/MyServices';
 
diff --git a/src/routes/MyServices/index.js b/src/routes/MyServices/index.js
index a71dea7..0112046 100644
--- a/src/routes/MyServices/index.js
+++ b/src/routes/MyServices/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'my-services',
@@ -9,7 +9,7 @@ export default (store) => ({
       const MyServices = require('./containers/MyServicesContainer').default;
       const reducer = require('./modules/MyServices').default;
 
-      injectReducer(store, { key: 'myServices', reducer });
+      injectReducer(store, {key: 'myServices', reducer});
       cb(null, MyServices);
     }, 'MyServices');
   },
diff --git a/src/routes/MyServices/modules/MyServices.js b/src/routes/MyServices/modules/MyServices.js
index b741caa..c75f154 100644
--- a/src/routes/MyServices/modules/MyServices.js
+++ b/src/routes/MyServices/modules/MyServices.js
@@ -1,5 +1,5 @@
-import { handleActions, createAction } from 'redux-actions';
-import Reactable from 'Reactable';
+import {handleActions, createAction} from 'redux-actions';
+import Reactable from 'reactable';
 
 const unsafe = Reactable.unsafe;
 
@@ -49,96 +49,96 @@ export default handleActions({
   }),
 }, {
   // initial data
-  items: { value: 10, label: '10' },
-  displaying: {start: 1, end: 10, currentPage: 0 },
+  items: {value: 10, label: '10'},
+  displaying: {start: 1, end: 10, currentPage: 0},
   servicesTableData: [
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name porem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Oorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name porem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Oorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name aorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name aorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name  xorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Gorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name  xorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Gorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name korem ipsum</a>'), Pricing: '$ 8.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name korem ipsum</a>'), Pricing: '$ 8.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name eorem ipsum</a>'), Pricing: '$ 2.99 / mile', 'Service Description': 'Lorem ipsum solor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name eorem ipsum</a>'), Pricing: '$ 2.99 / mile', 'Service Description': 'Lorem ipsum solor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name worem ipsum</a>'), Pricing: '$ 6.99 / mile', 'Service Description': 'Worem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name worem ipsum</a>'), Pricing: '$ 6.99 / mile', 'Service Description': 'Worem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 4.99 / mile', 'Service Description': 'Lorem ipsum molor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 4.99 / mile', 'Service Description': 'Lorem ipsum molor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Iorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Iorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Torem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Torem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name porem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Oorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name porem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Oorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name aorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name aorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name  xorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Gorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name  xorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Gorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name korem ipsum</a>'), Pricing: '$ 8.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name korem ipsum</a>'), Pricing: '$ 8.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name eorem ipsum</a>'), Pricing: '$ 2.99 / mile', 'Service Description': 'Lorem ipsum solor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name eorem ipsum</a>'), Pricing: '$ 2.99 / mile', 'Service Description': 'Lorem ipsum solor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name worem ipsum</a>'), Pricing: '$ 6.99 / mile', 'Service Description': 'Worem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name worem ipsum</a>'), Pricing: '$ 6.99 / mile', 'Service Description': 'Worem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 4.99 / mile', 'Service Description': 'Lorem ipsum molor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 4.99 / mile', 'Service Description': 'Lorem ipsum molor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Iorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Iorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
-    { Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Torem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
+    {Service: unsafe('<a herf="javascript:;">Service name lorem ipsum</a>'), Pricing: '$ 9.99 / mile', 'Service Description': 'Torem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor', '': unsafe(rowActions),
     },
 
   ],
diff --git a/src/routes/ServiceDetails/components/AvailablePackages/AvailablePackages.jsx b/src/routes/ServiceDetails/components/AvailablePackages/AvailablePackages.jsx
index 0b999fe..7bd83f3 100644
--- a/src/routes/ServiceDetails/components/AvailablePackages/AvailablePackages.jsx
+++ b/src/routes/ServiceDetails/components/AvailablePackages/AvailablePackages.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './AvailablePackages.scss';
 import AvailablePackagesItem from '../AvailablePackagesItem';
diff --git a/src/routes/ServiceDetails/components/AvailablePackagesItem/AvailablePackagesItem.jsx b/src/routes/ServiceDetails/components/AvailablePackagesItem/AvailablePackagesItem.jsx
index d16b20a..afe8bd1 100644
--- a/src/routes/ServiceDetails/components/AvailablePackagesItem/AvailablePackagesItem.jsx
+++ b/src/routes/ServiceDetails/components/AvailablePackagesItem/AvailablePackagesItem.jsx
@@ -1,7 +1,7 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import Button from 'components/Button';
-import { Link } from 'react-router';
+import {Link} from 'react-router';
 import styles from './AvailablePackagesItem.scss';
 
 /*
diff --git a/src/routes/ServiceDetails/components/ServiceDetailsHeader/ServiceDetailsHeader.jsx b/src/routes/ServiceDetails/components/ServiceDetailsHeader/ServiceDetailsHeader.jsx
index 18328c0..ad60bff 100644
--- a/src/routes/ServiceDetails/components/ServiceDetailsHeader/ServiceDetailsHeader.jsx
+++ b/src/routes/ServiceDetails/components/ServiceDetailsHeader/ServiceDetailsHeader.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import CSSModules from 'react-css-modules';
 import Button from 'components/Button';
-import { Link } from 'react-router';
+import {Link} from 'react-router';
 import styles from './ServiceDetailsHeader.scss';
 
 /*
diff --git a/src/routes/ServiceDetails/components/ServiceDetailsView.jsx b/src/routes/ServiceDetails/components/ServiceDetailsView.jsx
index df907ce..32150bd 100644
--- a/src/routes/ServiceDetails/components/ServiceDetailsView.jsx
+++ b/src/routes/ServiceDetails/components/ServiceDetailsView.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './ServiceDetailsView.scss';
 import ServiceDetailsHeader from './ServiceDetailsHeader';
diff --git a/src/routes/ServiceDetails/components/ServiceInfoDetails/ServiceInfoDetails.jsx b/src/routes/ServiceDetails/components/ServiceInfoDetails/ServiceInfoDetails.jsx
index 5ca13dd..cf3251f 100644
--- a/src/routes/ServiceDetails/components/ServiceInfoDetails/ServiceInfoDetails.jsx
+++ b/src/routes/ServiceDetails/components/ServiceInfoDetails/ServiceInfoDetails.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './ServiceInfoDetails.scss';
 
diff --git a/src/routes/ServiceDetails/containers/AvailablePackagesContainer.js b/src/routes/ServiceDetails/containers/AvailablePackagesContainer.js
index 550c1ee..0e887ed 100644
--- a/src/routes/ServiceDetails/containers/AvailablePackagesContainer.js
+++ b/src/routes/ServiceDetails/containers/AvailablePackagesContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import AvailablePackages from '../components/AvailablePackages';
 
 const mapState = (state) => state.serviceDetails;
diff --git a/src/routes/ServiceDetails/containers/ServiceDetailsContainer.js b/src/routes/ServiceDetails/containers/ServiceDetailsContainer.js
index 6761dd4..c7900fd 100644
--- a/src/routes/ServiceDetails/containers/ServiceDetailsContainer.js
+++ b/src/routes/ServiceDetails/containers/ServiceDetailsContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import ServiceDetailsView from '../components/ServiceDetailsView';
 
 const mapState = (state) => state.serviceDetails;
diff --git a/src/routes/ServiceDetails/index.js b/src/routes/ServiceDetails/index.js
index 0a1f001..4f08bef 100644
--- a/src/routes/ServiceDetails/index.js
+++ b/src/routes/ServiceDetails/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'service-details',
@@ -9,7 +9,7 @@ export default (store) => ({
       const ServiceDetails = require('./containers/ServiceDetailsContainer').default;
       const reducer = require('./modules/ServiceDetails').default;
 
-      injectReducer(store, { key: 'serviceDetails', reducer });
+      injectReducer(store, {key: 'serviceDetails', reducer});
       cb(null, ServiceDetails);
     }, 'ServiceDetails');
   },
diff --git a/src/routes/ServiceDetails/modules/ServiceDetails.js b/src/routes/ServiceDetails/modules/ServiceDetails.js
index b884fa0..0ed2466 100644
--- a/src/routes/ServiceDetails/modules/ServiceDetails.js
+++ b/src/routes/ServiceDetails/modules/ServiceDetails.js
@@ -1,4 +1,4 @@
-import { handleActions } from 'redux-actions';
+import {handleActions} from 'redux-actions';
 
 // ------------------------------------
 // Actions
diff --git a/src/routes/ServiceRequest/components/ContactDetails/ContactDetails.jsx b/src/routes/ServiceRequest/components/ContactDetails/ContactDetails.jsx
index aff4909..b519c8b 100644
--- a/src/routes/ServiceRequest/components/ContactDetails/ContactDetails.jsx
+++ b/src/routes/ServiceRequest/components/ContactDetails/ContactDetails.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import Accordion from 'components/Accordion';
 import FormField from 'components/FormField';
diff --git a/src/routes/ServiceRequest/components/EstimatedAmountToPay/EstimatedAmountToPay.jsx b/src/routes/ServiceRequest/components/EstimatedAmountToPay/EstimatedAmountToPay.jsx
index 1d31215..b2b6071 100644
--- a/src/routes/ServiceRequest/components/EstimatedAmountToPay/EstimatedAmountToPay.jsx
+++ b/src/routes/ServiceRequest/components/EstimatedAmountToPay/EstimatedAmountToPay.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import Accordion from 'components/Accordion';
 import FormField from 'components/FormField';
diff --git a/src/routes/ServiceRequest/components/ItemRequest/ItemRequest.jsx b/src/routes/ServiceRequest/components/ItemRequest/ItemRequest.jsx
index 7053835..4e0700b 100644
--- a/src/routes/ServiceRequest/components/ItemRequest/ItemRequest.jsx
+++ b/src/routes/ServiceRequest/components/ItemRequest/ItemRequest.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import Accordion from 'components/Accordion';
 import FormField from 'components/FormField';
@@ -12,15 +12,15 @@ import _ from 'lodash';
 import styles from './ItemRequest.scss';
 
 const worthOptions = [
-  { value: 1, label: '100 - 5000 $' },
-  { value: 2, label: '5001 - 10000 $' },
-  { value: 3, label: '> 10001 $' },
+  {value: 1, label: '100 - 5000 $'},
+  {value: 2, label: '5001 - 10000 $'},
+  {value: 3, label: '> 10001 $'},
 ];
 
 const weightOptions = [
-  { value: 1, label: '0 - 500 gms' },
-  { value: 2, label: '501 - 2500 gms' },
-  { value: 3, label: '> 2500 gms' },
+  {value: 1, label: '0 - 500 gms'},
+  {value: 2, label: '501 - 2500 gms'},
+  {value: 3, label: '> 2500 gms'},
 ];
 
 
diff --git a/src/routes/ServiceRequest/components/Location/Location.jsx b/src/routes/ServiceRequest/components/Location/Location.jsx
index 731f8c7..f763479 100644
--- a/src/routes/ServiceRequest/components/Location/Location.jsx
+++ b/src/routes/ServiceRequest/components/Location/Location.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './Location.scss';
 
@@ -7,7 +7,7 @@ import styles from './Location.scss';
 * Location
 */
 
-export const Location = ({ type, address }) => (
+export const Location = ({type, address}) => (
   <div styleName="location">
     <i styleName={`icon-${type}`} />
     <div styleName="text">
diff --git a/src/routes/ServiceRequest/components/MapLegends/MapLegends.jsx b/src/routes/ServiceRequest/components/MapLegends/MapLegends.jsx
index ffc9687..b9e6533 100644
--- a/src/routes/ServiceRequest/components/MapLegends/MapLegends.jsx
+++ b/src/routes/ServiceRequest/components/MapLegends/MapLegends.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './MapLegends.scss';
 
diff --git a/src/routes/ServiceRequest/components/ProviderMap/ProviderMap.jsx b/src/routes/ServiceRequest/components/ProviderMap/ProviderMap.jsx
index dcc026e..bb07ed1 100644
--- a/src/routes/ServiceRequest/components/ProviderMap/ProviderMap.jsx
+++ b/src/routes/ServiceRequest/components/ProviderMap/ProviderMap.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import MapLegends from '../MapLegends';
 import styles from './ProviderMap.scss';
@@ -13,7 +13,7 @@ const getImage = (name) => `${window.location.origin}/img/${name}`;
 class ProviderMap extends React.Component {
 
   componentDidMount() {
-    const { doneCoords, wayPoints } = this.props;
+    const {doneCoords, wayPoints} = this.props;
 
     this.map = new google.maps.Map(this.node, {
       zoom: 16,
@@ -48,7 +48,7 @@ class ProviderMap extends React.Component {
     });
   }
 
-  shouldComponentUpdate() {
+  shouldComponentUpdate() { // eslint-disable-line lodash/prefer-constant
     // the whole logic is handled by google plugin
     return false;
   }
diff --git a/src/routes/ServiceRequest/components/ServiceDetail/ServiceDetail.jsx b/src/routes/ServiceRequest/components/ServiceDetail/ServiceDetail.jsx
index d70ba0f..f05d359 100644
--- a/src/routes/ServiceRequest/components/ServiceDetail/ServiceDetail.jsx
+++ b/src/routes/ServiceRequest/components/ServiceDetail/ServiceDetail.jsx
@@ -1,7 +1,7 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import Button from 'components/Button';
-import { reduxForm } from 'redux-form';
+import {reduxForm} from 'redux-form';
 import Location from '../Location';
 import ItemRequest from '../ItemRequest';
 import ContactDetails from '../ContactDetails';
@@ -67,4 +67,4 @@ const validate = (values) => {
   return errors;
 };
 
-export default reduxForm({ form: 'serviceRequest', fields, validate })(CSSModules(ServiceDetail, styles));
+export default reduxForm({form: 'serviceRequest', fields, validate})(CSSModules(ServiceDetail, styles));
diff --git a/src/routes/ServiceRequest/containers/ProviderMapContainer.js b/src/routes/ServiceRequest/containers/ProviderMapContainer.js
index dae7e69..299e8f6 100644
--- a/src/routes/ServiceRequest/containers/ProviderMapContainer.js
+++ b/src/routes/ServiceRequest/containers/ProviderMapContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import ProviderMap from '../components/ProviderMap';
 
 const mapState = (state) => state.serviceRequest;
diff --git a/src/routes/ServiceRequest/containers/ServiceDetailContainer.js b/src/routes/ServiceRequest/containers/ServiceDetailContainer.js
index 5b61e56..18349c4 100644
--- a/src/routes/ServiceRequest/containers/ServiceDetailContainer.js
+++ b/src/routes/ServiceRequest/containers/ServiceDetailContainer.js
@@ -1,4 +1,4 @@
-import { connect } from 'react-redux';
+import {connect} from 'react-redux';
 import {actions, sendRequest} from '../modules/ServiceRequest';
 
 import ServiceDetail from '../components/ServiceDetail';
diff --git a/src/routes/ServiceRequest/containers/ServiceRequestContainer.js b/src/routes/ServiceRequest/containers/ServiceRequestContainer.js
index 059d695..dafc5b3 100644
--- a/src/routes/ServiceRequest/containers/ServiceRequestContainer.js
+++ b/src/routes/ServiceRequest/containers/ServiceRequestContainer.js
@@ -1,4 +1,4 @@
-import { asyncConnect } from 'redux-connect';
+import {asyncConnect} from 'redux-connect';
 import {actions} from '../modules/ServiceRequest';
 
 import ServiceRequestView from '../components/ServiceRequestView';
diff --git a/src/routes/ServiceRequest/index.js b/src/routes/ServiceRequest/index.js
index b6fb6c5..82b16ca 100644
--- a/src/routes/ServiceRequest/index.js
+++ b/src/routes/ServiceRequest/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'service-request',
@@ -9,7 +9,7 @@ export default (store) => ({
       const ServiceRequest = require('./containers/ServiceRequestContainer').default;
       const reducer = require('./modules/ServiceRequest').default;
 
-      injectReducer(store, { key: 'serviceRequest', reducer });
+      injectReducer(store, {key: 'serviceRequest', reducer});
       cb(null, ServiceRequest);
     }, 'ServiceRequest');
   },
diff --git a/src/routes/ServiceRequest/modules/ServiceRequest.js b/src/routes/ServiceRequest/modules/ServiceRequest.js
index df34dd0..11908e6 100644
--- a/src/routes/ServiceRequest/modules/ServiceRequest.js
+++ b/src/routes/ServiceRequest/modules/ServiceRequest.js
@@ -1,4 +1,4 @@
-import { handleActions } from 'redux-actions';
+import {handleActions} from 'redux-actions';
 
 // ------------------------------------
 // Actions
diff --git a/src/routes/StatusDetail/components/DroneGraphPerformance/DroneGraphPerformance.jsx b/src/routes/StatusDetail/components/DroneGraphPerformance/DroneGraphPerformance.jsx
index 477fb42..b37b874 100644
--- a/src/routes/StatusDetail/components/DroneGraphPerformance/DroneGraphPerformance.jsx
+++ b/src/routes/StatusDetail/components/DroneGraphPerformance/DroneGraphPerformance.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import ReactHighcharts from 'react-highcharts';
 import SelectDropdown from 'components/SelectDropdown';
@@ -87,22 +87,22 @@ function getConfig(currentGraphType, graphTypeOptions, dataList) {
   const config = _.cloneDeep(configReactHighcharts);
   const data = dataList[currentGraphType];
 
-  config.series[0].name = _.find(graphTypeOptions, { value: currentGraphType }).label;
+  config.series[0].name = _.find(graphTypeOptions, {value: currentGraphType}).label;
   config.series[0].data = data;
 
   config.tooltip.valueSuffix = currentGraphType === 'altitude' ? ' ft' : ' mph';
   // set the max y-axis 10% more then max value of the data
-  config.yAxis.max = Math.ceil(_.max(_.values(_.fromPairs(data))) * 1.1);
+  config.yAxis.max = Math.ceil(_(data).fromPairs().values().max() * 1.1);
 
   return config;
 }
 
 const graphTypeOptions = [
-  { value: 'altitude', label: 'Altitude' },
-  { value: 'speed', label: 'Speed' },
+  {value: 'altitude', label: 'Altitude'},
+  {value: 'speed', label: 'Speed'},
 ];
 
-export const DroneGraphPerformance = ({ altitude, speed, currentGraphType, setCurrentGraphType }) => (
+export const DroneGraphPerformance = ({altitude, speed, currentGraphType, setCurrentGraphType}) => (
   <div styleName="drone-graph-performance">
     <header styleName="header">
       <div>
@@ -112,7 +112,7 @@ export const DroneGraphPerformance = ({ altitude, speed, currentGraphType, setCu
       <SelectDropdown options={graphTypeOptions} value={currentGraphType} onChange={(value) => setCurrentGraphType(value)} />
     </header>
     <div styleName="content">
-      <ReactHighcharts config={getConfig(currentGraphType, graphTypeOptions, { altitude, speed })} />
+      <ReactHighcharts config={getConfig(currentGraphType, graphTypeOptions, {altitude, speed})} />
     </div>
   </div>
 );
diff --git a/src/routes/StatusDetail/components/DroneLocationsETA/DroneLocationsETA.jsx b/src/routes/StatusDetail/components/DroneLocationsETA/DroneLocationsETA.jsx
index b2e1bce..d609147 100644
--- a/src/routes/StatusDetail/components/DroneLocationsETA/DroneLocationsETA.jsx
+++ b/src/routes/StatusDetail/components/DroneLocationsETA/DroneLocationsETA.jsx
@@ -1,8 +1,8 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './DroneLocationsETA.scss';
 
-export const DroneLocationsETA = ({ eta }) => (
+export const DroneLocationsETA = ({eta}) => (
   <div styleName="drone-locations-eta">
    ETA: <span styleName="value">{eta}</span>
   </div>
diff --git a/src/routes/StatusDetail/components/MissionGallery/MissionGallery.jsx b/src/routes/StatusDetail/components/MissionGallery/MissionGallery.jsx
index 49f5782..be645cf 100644
--- a/src/routes/StatusDetail/components/MissionGallery/MissionGallery.jsx
+++ b/src/routes/StatusDetail/components/MissionGallery/MissionGallery.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import Slider from 'react-slick';
 import _ from 'lodash';
@@ -15,7 +15,7 @@ const sliderProps = {
   variableWidth: false,
 };
 
-export const MissionGallery = ({ title, items, note }) => (
+export const MissionGallery = ({title, items, note}) => (
   <div styleName="mission-gallery">
     <header styleName="header">
       <h2 styleName="title">{title}</h2>
diff --git a/src/routes/StatusDetail/components/MissionGalleryItem/MissionGalleryItem.jsx b/src/routes/StatusDetail/components/MissionGalleryItem/MissionGalleryItem.jsx
index 32b9c57..689192f 100644
--- a/src/routes/StatusDetail/components/MissionGalleryItem/MissionGalleryItem.jsx
+++ b/src/routes/StatusDetail/components/MissionGalleryItem/MissionGalleryItem.jsx
@@ -1,8 +1,8 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './MissionGalleryItem.scss';
 
-export const MissionGalleryItem = ({ type, src }) => (
+export const MissionGalleryItem = ({type, src}) => (
   <div styleName="mission-gallery-item">
     {type === 'image' &&
       <img src={src} alt="" styleName="image" />
diff --git a/src/routes/StatusDetail/components/ModalRatePilot/ModalRatePilot.jsx b/src/routes/StatusDetail/components/ModalRatePilot/ModalRatePilot.jsx
index 5d2cc90..c7b43db 100644
--- a/src/routes/StatusDetail/components/ModalRatePilot/ModalRatePilot.jsx
+++ b/src/routes/StatusDetail/components/ModalRatePilot/ModalRatePilot.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import Modal from 'react-modal';
 import Button from 'components/Button';
@@ -32,7 +32,7 @@ const modalStyle = {
   },
 };
 
-export const ModalRatePilot = ({ isOpen, onClose, onRate, onOpen }) => (
+export const ModalRatePilot = ({isOpen, onClose, onRate, onOpen}) => (
   <div styleName="modal-rate-pilot">
     <Button onClick={onOpen} color="blue">Rate now!</Button>
     <Modal
diff --git a/src/routes/StatusDetail/components/OverallDronePerformance/OverallDronePerformance.jsx b/src/routes/StatusDetail/components/OverallDronePerformance/OverallDronePerformance.jsx
index 6fad179..59cdc13 100644
--- a/src/routes/StatusDetail/components/OverallDronePerformance/OverallDronePerformance.jsx
+++ b/src/routes/StatusDetail/components/OverallDronePerformance/OverallDronePerformance.jsx
@@ -1,9 +1,9 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import Rate from 'components/Rate';
 import styles from './OverallDronePerformance.scss';
 
-export const OverallDronePerformance = ({ total, speed, easeOfuse, flight, camera }) => (
+export const OverallDronePerformance = ({total, speed, easeOfuse, flight, camera}) => (
   <div styleName="overall-drone-performance">
     <header styleName="header">
       <div>
diff --git a/src/routes/StatusDetail/components/RatePilotForm/RatePilotForm.jsx b/src/routes/StatusDetail/components/RatePilotForm/RatePilotForm.jsx
index 72edbbe..276a848 100644
--- a/src/routes/StatusDetail/components/RatePilotForm/RatePilotForm.jsx
+++ b/src/routes/StatusDetail/components/RatePilotForm/RatePilotForm.jsx
@@ -1,13 +1,13 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
-import { reduxForm } from 'redux-form';
+import {reduxForm} from 'redux-form';
 import _ from 'lodash';
 import Button from 'components/Button';
 import Rate from 'components/Rate';
 import FormField from 'components/FormField';
 import styles from './RatePilotForm.scss';
 
-export const RatePilotForm = ({ handleSubmit, onCloseClick, fields }) => (
+export const RatePilotForm = ({handleSubmit, onCloseClick, fields}) => (
   <form styleName="content" onSubmit={handleSubmit}>
     <div styleName="star-rating">
       <FormField label="Click your vote:" {...fields.rate}>
@@ -44,4 +44,4 @@ const validate = (values) => {
   return errors;
 };
 
-export default reduxForm({ form: 'ratePilot', fields, validate })(CSSModules(RatePilotForm, styles));
+export default reduxForm({form: 'ratePilot', fields, validate})(CSSModules(RatePilotForm, styles));
diff --git a/src/routes/StatusDetail/components/StatusDetailCamera/StatusDetailCamera.jsx b/src/routes/StatusDetail/components/StatusDetailCamera/StatusDetailCamera.jsx
index 9f2378d..a40ac0a 100644
--- a/src/routes/StatusDetail/components/StatusDetailCamera/StatusDetailCamera.jsx
+++ b/src/routes/StatusDetail/components/StatusDetailCamera/StatusDetailCamera.jsx
@@ -1,8 +1,8 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './StatusDetailCamera.scss';
 
-export const StatusDetailCamera = ({ title, streamSrc }) => (
+export const StatusDetailCamera = ({title, streamSrc}) => (
   <div styleName="status-detail-camera">
     {streamSrc ? (
       <img src={streamSrc} styleName="embeded" alt={title} />
diff --git a/src/routes/StatusDetail/components/StatusDetailHeader/StatusDetailHeader.jsx b/src/routes/StatusDetail/components/StatusDetailHeader/StatusDetailHeader.jsx
index 3d961f5..023bfd2 100644
--- a/src/routes/StatusDetail/components/StatusDetailHeader/StatusDetailHeader.jsx
+++ b/src/routes/StatusDetail/components/StatusDetailHeader/StatusDetailHeader.jsx
@@ -1,9 +1,9 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import StatusLabel from 'components/StatusLabel';
 import styles from './StatusDetailHeader.scss';
 
-export const StatusDetailHeader = ({ title, status, children }) => (
+export const StatusDetailHeader = ({title, status, children}) => (
   <div styleName="status-detail-header">
     <h1 styleName="title">{title}</h1>
     <div styleName="status">
diff --git a/src/routes/StatusDetail/components/StatusDetailInfo/StatusDetailInfo.jsx b/src/routes/StatusDetail/components/StatusDetailInfo/StatusDetailInfo.jsx
index d36aad2..bb41955 100644
--- a/src/routes/StatusDetail/components/StatusDetailInfo/StatusDetailInfo.jsx
+++ b/src/routes/StatusDetail/components/StatusDetailInfo/StatusDetailInfo.jsx
@@ -1,10 +1,10 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import dateFormat from 'dateformat';
 import TimeAgo from 'react-timeago';
 import styles from './StatusDetailInfo.scss';
 
-export const StatusDetailInfo = ({ launchedAt, completedAt, speed, distance, driver }) => (
+export const StatusDetailInfo = ({launchedAt, completedAt, speed, distance, driver}) => (
   <div styleName="status-detail-info">
     <table styleName="table">
       <thead>
diff --git a/src/routes/StatusDetail/components/StatusDetailMapRoute/StatusDetailMapRoute.jsx b/src/routes/StatusDetail/components/StatusDetailMapRoute/StatusDetailMapRoute.jsx
index cb195eb..945b04e 100644
--- a/src/routes/StatusDetail/components/StatusDetailMapRoute/StatusDetailMapRoute.jsx
+++ b/src/routes/StatusDetail/components/StatusDetailMapRoute/StatusDetailMapRoute.jsx
@@ -1,11 +1,11 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import MissionPlanner from 'components/MissionPlanner';
 import MapLegends from 'components/MapLegends';
 import DroneLocationsETA from '../DroneLocationsETA';
 import styles from './StatusDetailMapRoute.scss';
 
-export const StatusDetailMapRoute = ({ distance, eta, showMapLegends, providerCoords, droneCoords, mission, isSmall }) => (
+export const StatusDetailMapRoute = ({distance, eta, showMapLegends, providerCoords, droneCoords, mission, isSmall}) => (
   <div styleName="status-detail-map-route">
     <MissionPlanner
       {...{
diff --git a/src/routes/StatusDetail/components/StatusDetailView.jsx b/src/routes/StatusDetail/components/StatusDetailView.jsx
index 37dba0a..532ae62 100644
--- a/src/routes/StatusDetail/components/StatusDetailView.jsx
+++ b/src/routes/StatusDetail/components/StatusDetailView.jsx
@@ -1,4 +1,4 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import Breadcrumb from 'components/Breadcrumb';
 import StatusLabel from 'components/StatusLabel';
@@ -13,13 +13,13 @@ import StatusDetailHeader from './StatusDetailHeader';
 import StatusDetailCamera from './StatusDetailCamera';
 import styles from './StatusDetailView.scss';
 
-export const StatusDetailView = ({ title, status, fcStreamSrc, bcStreamSrc }) => (
+export const StatusDetailView = ({title, status, fcStreamSrc, bcStreamSrc}) => (
   <div styleName="status-detail-view">
     <Breadcrumb
       items={[
-        { text: 'Profile', path: '/' },
-        { text: 'My Request Status', path: '/my-request-status' },
-        { text: title },
+        {text: 'Profile', path: '/'},
+        {text: 'My Request Status', path: '/my-request-status'},
+        {text: title},
       ]}
     />
     {status === 'completed' ? (
diff --git a/src/routes/StatusDetail/components/StatusProjectInfo/StatusProjectInfo.jsx b/src/routes/StatusDetail/components/StatusProjectInfo/StatusProjectInfo.jsx
index 91b0076..1c8120d 100644
--- a/src/routes/StatusDetail/components/StatusProjectInfo/StatusProjectInfo.jsx
+++ b/src/routes/StatusDetail/components/StatusProjectInfo/StatusProjectInfo.jsx
@@ -1,8 +1,8 @@
-import React, { PropTypes } from 'react';
+import React, {PropTypes} from 'react';
 import CSSModules from 'react-css-modules';
 import styles from './StatusProjectInfo.scss';
 
-export const StatusProjectInfo = ({ name, description, address, contactName, tel }) => (
+export const StatusProjectInfo = ({name, description, address, contactName, tel}) => (
   <table styleName="status-project-info">
     <tbody>
       <tr>
diff --git a/src/routes/StatusDetail/containers/DroneGraphPerformanceContainer.js b/src/routes/StatusDetail/containers/DroneGraphPerformanceContainer.js
index 170574e..ba2af81 100644
--- a/src/routes/StatusDetail/containers/DroneGraphPerformanceContainer.js
+++ b/src/routes/StatusDetail/containers/DroneGraphPerformanceContainer.js
@@ -1,12 +1,12 @@
-import { asyncConnect } from 'redux-connect';
-import { actions } from '../modules/StatusDetail';
+import {asyncConnect} from 'redux-connect';
+import {actions} from '../modules/StatusDetail';
 
 import DroneGraphPerformance from '../components/DroneGraphPerformance';
 
 const resolve = [{
-  promise: ({ params, store }) => store.dispatch(actions.load(params.id)),
+  promise: ({params, store}) => store.dispatch(actions.load(params.id)),
 }];
 
-const mapState = (state) => ({ ...state.statusDetail.droneGraphPerformance, currentGraphType: state.statusDetail.currentGraphType });
+const mapState = (state) => ({...state.statusDetail.droneGraphPerformance, currentGraphType: state.statusDetail.currentGraphType});
 
 export default asyncConnect(resolve, mapState, actions)(DroneGraphPerformance);
diff --git a/src/routes/StatusDetail/containers/MissionGalleryContainer.js b/src/routes/StatusDetail/containers/MissionGalleryContainer.js
index ce3c10a..1b9ca80 100644
--- a/src/routes/StatusDetail/containers/MissionGalleryContainer.js
+++ b/src/routes/StatusDetail/containers/MissionGalleryContainer.js
@@ -1,12 +1,12 @@
-import { asyncConnect } from 'redux-connect';
-import { actions } from '../modules/StatusDetail';
+import {asyncConnect} from 'redux-connect';
+import {actions} from '../modules/StatusDetail';
 
 import MissionGallery from '../components/MissionGallery';
 
 const resolve = [{
-  promise: ({ params, store }) => store.dispatch(actions.load(params.id)),
+  promise: ({params, store}) => store.dispatch(actions.load(params.id)),
 }];
 
-const mapState = (state) => ({ items: state.statusDetail.missionGallery, note: state.statusDetail.missionGalleryNote });
+const mapState = (state) => ({items: state.statusDetail.missionGallery, note: state.statusDetail.missionGalleryNote});
 
 export default asyncConnect(resolve, mapState, actions)(MissionGallery);
diff --git a/src/routes/StatusDetail/containers/ModalRatePilotContainer.js b/src/routes/StatusDetail/containers/ModalRatePilotContainer.js
index c20bf3c..e7a3173 100644
--- a/src/routes/StatusDetail/containers/ModalRatePilotContainer.js
+++ b/src/routes/StatusDetail/containers/ModalRatePilotContainer.js
@@ -1,13 +1,13 @@
-import { asyncConnect } from 'redux-connect';
-import { actions } from '../modules/StatusDetail';
+import {asyncConnect} from 'redux-connect';
+import {actions} from '../modules/StatusDetail';
 
 import ModalRatePilot from '../components/ModalRatePilot';
 
 const resolve = [{
-  promise: ({ params, store }) => store.dispatch(actions.load(params.id)),
+  promise: ({params, store}) => store.dispatch(actions.load(params.id)),
 }];
 
-const mapState = (state) => ({ isOpen: state.statusDetail.isRateModalOpen });
+const mapState = (state) => ({isOpen: state.statusDetail.isRateModalOpen});
 
 export default asyncConnect(resolve, mapState, {
   onClose: actions.closeRateModal,
diff --git a/src/routes/StatusDetail/containers/OverallDronePerformanceContainer.js b/src/routes/StatusDetail/containers/OverallDronePerformanceContainer.js
index ce92f3a..3c3d259 100644
--- a/src/routes/StatusDetail/containers/OverallDronePerformanceContainer.js
+++ b/src/routes/StatusDetail/containers/OverallDronePerformanceContainer.js
@@ -1,10 +1,10 @@
-import { asyncConnect } from 'redux-connect';
-import { actions } from '../modules/StatusDetail';
+import {asyncConnect} from 'redux-connect';
+import {actions} from '../modules/StatusDetail';
 
 import OverallDronePerformance from '../components/OverallDronePerformance';
 
 const resolve = [{
-  promise: ({ params, store }) => store.dispatch(actions.load(params.id)),
+  promise: ({params, store}) => store.dispatch(actions.load(params.id)),
 }];
 
 const mapState = (state) => state.statusDetail.overallDronePerformance;
diff --git a/src/routes/StatusDetail/containers/StatusDetailContainer.js b/src/routes/StatusDetail/containers/StatusDetailContainer.js
index a505090..c3b2d82 100644
--- a/src/routes/StatusDetail/containers/StatusDetailContainer.js
+++ b/src/routes/StatusDetail/containers/StatusDetailContainer.js
@@ -1,10 +1,10 @@
-import { asyncConnect } from 'redux-connect';
-import { actions } from '../modules/StatusDetail';
+import {asyncConnect} from 'redux-connect';
+import {actions} from '../modules/StatusDetail';
 
 import StatusDetailView from '../components/StatusDetailView';
 
 const resolve = [{
-  promise: ({ params, store }) => store.dispatch(actions.load(params.id)),
+  promise: ({params, store}) => store.dispatch(actions.load(params.id)),
 }];
 
 const mapState = (state) => state.statusDetail;
diff --git a/src/routes/StatusDetail/containers/StatusDetailInfoContainer.js b/src/routes/StatusDetail/containers/StatusDetailInfoContainer.js
index 7e323ca..feeeaf3 100644
--- a/src/routes/StatusDetail/containers/StatusDetailInfoContainer.js
+++ b/src/routes/StatusDetail/containers/StatusDetailInfoContainer.js
@@ -1,10 +1,10 @@
-import { asyncConnect } from 'redux-connect';
-import { actions } from '../modules/StatusDetail';
+import {asyncConnect} from 'redux-connect';
+import {actions} from '../modules/StatusDetail';
 
 import StatusDetailInfo from '../components/StatusDetailInfo';
 
 const resolve = [{
-  promise: ({ params, store }) => store.dispatch(actions.load(params.id)),
+  promise: ({params, store}) => store.dispatch(actions.load(params.id)),
 }];
 
 const mapState = (state) => state.statusDetail;
diff --git a/src/routes/StatusDetail/containers/StatusDetailMapRouteContainer.js b/src/routes/StatusDetail/containers/StatusDetailMapRouteContainer.js
index c8e03d8..49f81f2 100644
--- a/src/routes/StatusDetail/containers/StatusDetailMapRouteContainer.js
+++ b/src/routes/StatusDetail/containers/StatusDetailMapRouteContainer.js
@@ -1,12 +1,12 @@
-import { asyncConnect } from 'redux-connect';
-import { actions } from '../modules/StatusDetail';
+import {asyncConnect} from 'redux-connect';
+import {actions} from '../modules/StatusDetail';
 
 import StatusDetailMapRoute from '../components/StatusDetailMapRoute';
 
 const resolve = [{
-  promise: ({ params, store }) => store.dispatch(actions.load(params.id)),
+  promise: ({params, store}) => store.dispatch(actions.load(params.id)),
 }];
 
-const mapState = (state, ownProps) => ({ ...state.statusDetail, ...ownProps });
+const mapState = (state, ownProps) => ({...state.statusDetail, ...ownProps});
 
 export default asyncConnect(resolve, mapState, actions)(StatusDetailMapRoute);
diff --git a/src/routes/StatusDetail/containers/StatusProjectInfoContainer.js b/src/routes/StatusDetail/containers/StatusProjectInfoContainer.js
index 0c67348..63cf849 100644
--- a/src/routes/StatusDetail/containers/StatusProjectInfoContainer.js
+++ b/src/routes/StatusDetail/containers/StatusProjectInfoContainer.js
@@ -1,10 +1,10 @@
-import { asyncConnect } from 'redux-connect';
-import { actions } from '../modules/StatusDetail';
+import {asyncConnect} from 'redux-connect';
+import {actions} from '../modules/StatusDetail';
 
 import StatusProjectInfo from '../components/StatusProjectInfo';
 
 const resolve = [{
-  promise: ({ params, store }) => store.dispatch(actions.load(params.id)),
+  promise: ({params, store}) => store.dispatch(actions.load(params.id)),
 }];
 
 const mapState = (state) => state.statusDetail.projectInfo;
diff --git a/src/routes/StatusDetail/index.js b/src/routes/StatusDetail/index.js
index 891264d..1c849d7 100644
--- a/src/routes/StatusDetail/index.js
+++ b/src/routes/StatusDetail/index.js
@@ -1,4 +1,4 @@
-import { injectReducer } from '../../store/reducers';
+import {injectReducer} from '../../store/reducers';
 
 export default (store) => ({
   path: 'status-detail/:id',
@@ -8,7 +8,7 @@ export default (store) => ({
       const StatusDetail = require('./containers/StatusDetailContainer').default;
       const reducer = require('./modules/StatusDetail').default;
 
-      injectReducer(store, { key: 'statusDetail', reducer });
+      injectReducer(store, {key: 'statusDetail', reducer});
       cb(null, StatusDetail);
     }, 'StatusDetail');
   },
diff --git a/src/routes/StatusDetail/modules/StatusDetail.js b/src/routes/StatusDetail/modules/StatusDetail.js
index 5b4484e..2c8bbfd 100644
--- a/src/routes/StatusDetail/modules/StatusDetail.js
+++ b/src/routes/StatusDetail/modules/StatusDetail.js
@@ -1,4 +1,4 @@
-import { handleActions } from 'redux-actions';
+import {handleActions} from 'redux-actions';
 import APIService from 'services/APIService';
 
 // ------------------------------------
@@ -16,25 +16,25 @@ export const SEND_RATE = 'StatusDetail/SEND_RATE';
 export const load = (id) => async(dispatch) => {
   const statusDetail = await APIService.getStatusDetail(id);
 
-  dispatch({ type: LOADED, payload: statusDetail });
+  dispatch({type: LOADED, payload: statusDetail});
 };
 
 export const setCurrentGraphType = (currentGraphType) => async(dispatch) => {
-  dispatch({ type: SET_CURRENT_GRAPH_TYPE, payload: currentGraphType });
+  dispatch({type: SET_CURRENT_GRAPH_TYPE, payload: currentGraphType});
 };
 
 export const openRateModal = () => async(dispatch) => {
-  dispatch({ type: OPEN_RATE_MODAL, payload: true });
+  dispatch({type: OPEN_RATE_MODAL, payload: true});
 };
 
 export const closeRateModal = () => async(dispatch) => {
-  dispatch({ type: CLOSE_RATE_MODAL, payload: false });
+  dispatch({type: CLOSE_RATE_MODAL, payload: false});
 };
 
 // send rate and comment here
 /* eslint-disable no-unused-vars */
-export const sendRate = ({ rate, comment }) => async(dispatch) => {
-  dispatch({ type: CLOSE_RATE_MODAL, payload: false });
+export const sendRate = ({rate, comment}) => async(dispatch) => {
+  dispatch({type: CLOSE_RATE_MODAL, payload: false});
 };
 /* eslint-enable no-unused-vars */
 
@@ -50,10 +50,10 @@ export const actions = {
 // Reducer
 // ------------------------------------
 export default handleActions({
-  [LOADED]: (state, { payload: statusDetail }) => ({ ...state, ...statusDetail }),
-  [SET_CURRENT_GRAPH_TYPE]: (state, { payload: currentGraphType }) => ({ ...state, currentGraphType }),
-  [OPEN_RATE_MODAL]: (state, { payload: isRateModalOpen }) => ({ ...state, isRateModalOpen }),
-  [CLOSE_RATE_MODAL]: (state, { payload: isRateModalOpen }) => ({ ...state, isRateModalOpen }),
+  [LOADED]: (state, {payload: statusDetail}) => ({...state, ...statusDetail}),
+  [SET_CURRENT_GRAPH_TYPE]: (state, {payload: currentGraphType}) => ({...state, currentGraphType}),
+  [OPEN_RATE_MODAL]: (state, {payload: isRateModalOpen}) => ({...state, isRateModalOpen}),
+  [CLOSE_RATE_MODAL]: (state, {payload: isRateModalOpen}) => ({...state, isRateModalOpen}),
 }, {
   currentGraphType: 'speed',
   isRateModalOpen: false,
diff --git a/src/routes/index.js b/src/routes/index.js
index 5c81746..28bd318 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -32,7 +32,7 @@ export const createRoutes = (store) => ({
   },
   childRoutes: [
     ServiceRequestRoute(store),
-	DashboardRoute(store),
+    DashboardRoute(store),
     MissionList(store),
     MissionPlanner(store),
     MyRequestRoute(store),
diff --git a/src/services/APIService.js b/src/services/APIService.js
index 145b04c..a69c8d2 100644
--- a/src/services/APIService.js
+++ b/src/services/APIService.js
@@ -1,3 +1,5 @@
+/* eslint max-lines: 0 */
+
 import _ from 'lodash';
 import superagent from 'superagent';
 import superagentPromise from 'superagent-promise';
@@ -487,7 +489,7 @@ export default class APIService {
       resolve();
     })).then(() => (
       filterByStatus && filterByStatus !== 'all'
-        ? _.filter(myRequestStatus, (request) => request.status === filterByStatus)
+        ? _.filter(myRequestStatus, {status: filterByStatus})
         : myRequestStatus
     ));
   }
@@ -525,27 +527,27 @@ export default class APIService {
     });
   }
 
-  static createMission(mission) {
+  static createMission(values) {
     return regAndAuth().then((authRes) => {
       const accessToken = authRes.body.accessToken;
 
       return request
         .post(`${config.API_BASE_PATH}/api/v1/missions`)
         .set('Authorization', `Bearer ${accessToken}`)
-        .send(mission)
+        .send(values)
         .end()
         .then((res) => res.body);
     });
   }
 
-  static updateMission(id, mission) {
+  static updateMission(id, values) {
     return regAndAuth().then((authRes) => {
       const accessToken = authRes.body.accessToken;
 
       return request
         .put(`${config.API_BASE_PATH}/api/v1/missions/${id}`)
         .set('Authorization', `Bearer ${accessToken}`)
-        .send(mission)
+        .send(values)
         .end()
         .then((res) => res.body);
     });
diff --git a/src/store/createStore.js b/src/store/createStore.js
index 1bed600..bc88646 100644
--- a/src/store/createStore.js
+++ b/src/store/createStore.js
@@ -1,13 +1,13 @@
-import { applyMiddleware, compose, createStore } from 'redux';
-import { routerMiddleware } from 'react-router-redux';
+import {applyMiddleware, compose, createStore} from 'redux';
+import {routerMiddleware} from 'react-router-redux';
 import thunk from 'redux-thunk';
 import createLogger from 'redux-logger';
-import makeRootReducer from './reducers';
+import {makeRootReducer} from './reducers';
 
 export default (initialState = {}, history) => {
   const middleware = [thunk, routerMiddleware(history)];
   if (process.env.NODE_ENV !== 'production') {
-    middleware.push(createLogger({ collapsed: true }));
+    middleware.push(createLogger({collapsed: true}));
   }
   const store = createStore(
     makeRootReducer(),
diff --git a/src/store/modules/global.js b/src/store/modules/global.js
index 4f8f2a6..0e0357c 100644
--- a/src/store/modules/global.js
+++ b/src/store/modules/global.js
@@ -1,8 +1,9 @@
-import { handleActions, createAction } from 'redux-actions';
-import { browserHistory } from 'react-router';
+import {handleActions, createAction} from 'redux-actions';
+import {browserHistory} from 'react-router';
 import UserApi from 'api/User.js';
-const config = require('../../config');
-const userApi = new UserApi(config.default.api.basePath);
+import config from '../../config';
+
+const userApi = new UserApi(config.api.basePath);
 
 // ------------------------------------
 // Actions
@@ -10,19 +11,20 @@ const userApi = new UserApi(config.default.api.basePath);
 let isLogged = false;
 let hasError = false;
 let errorText = '';
-const userData = {};
+
 export const sendLoginRequest = (values) => new Promise((resolve) => {
   userApi.login(values.email, values.password).then((authResult) => {
     isLogged = true;
     hasError = false;
-    if (authResult.user.role=='consumer')
+    if (authResult.user.role === 'consumer') {
       browserHistory.push('/browse-provider');
-    else if (authResult.user.role=='provider')
+    } else if (authResult.user.role === 'provider') {
       browserHistory.push('/dashboard');
-    else if (authResult.user.role=='admin')
+    } else if (authResult.user.role === 'admin') {
       browserHistory.push('/admin');
-    else if (authResult.user.role=='pilot')
+    } else if (authResult.user.role === 'pilot') {
       browserHistory.push('/pilot');
+    }
   }).catch((err) => {
     isLogged = false;
     hasError = true;
@@ -32,7 +34,7 @@ export const sendLoginRequest = (values) => new Promise((resolve) => {
 });
 
 export const sendSignupRequest = (values) => new Promise((resolve) => {
-  userApi.register('name', values.email, values.password).then((authResult) => {
+  userApi.register('name', values.email, values.password).then(() => {
     isLogged = true;
     hasError = false;
     browserHistory.push('/browse-provider');
@@ -61,10 +63,10 @@ export default handleActions({
   [toggleNotification]: (state, action) => ({
     ...state, toggleNotif: action.payload,
   }),
-  [loginAction]: (state, action) => ({
+  [loginAction]: (state) => ({
     ...state, loggedUser: isLogged, hasError, errorText,
   }),
-  [signupAction]: (state, action) => ({
+  [signupAction]: (state) => ({
     ...state, loggedUser: isLogged, hasError, errorText,
   }),
 }, {
@@ -73,17 +75,27 @@ export default handleActions({
   location: 'Jakarta, Indonesia',
   selectedCategory: 'Category',
   categories: [
-    { name: 'Category1' },
-    { name: 'Category2' },
+    {name: 'Category1'},
+    {name: 'Category2'},
   ],
   user: {
     name: 'John Doe',
   },
   notifications: [
-    {id: 1, droneName: 'XdroneManiac', status: 'completed',
-      time: '2 minutes ago', request: 'has completed your "Deliver My Package" request.'},
-    {id: 2, droneName: 'XdroneManiac', status: 'started',
-      time: '2 minutes ago', request: 'has started your "Deliver My Package" request.'},
+    {
+      id: 1,
+      droneName: 'XdroneManiac',
+      status: 'completed',
+      time: '2 minutes ago',
+      request: 'has completed your "Deliver My Package" request.',
+    },
+    {
+      id: 2,
+      droneName: 'XdroneManiac',
+      status: 'started',
+      time: '2 minutes ago',
+      request: 'has started your "Deliver My Package" request.',
+    },
   ],
 
 });
diff --git a/src/store/reducers.js b/src/store/reducers.js
index da5018b..74c68bc 100644
--- a/src/store/reducers.js
+++ b/src/store/reducers.js
@@ -1,8 +1,8 @@
-import { combineReducers } from 'redux';
-import { routerReducer as router } from 'react-router-redux';
-import { reducer as reduxAsyncConnect } from 'redux-connect';
-import { reducer as form } from 'redux-form';
-import { reducer as toastr } from 'react-redux-toastr';
+import {combineReducers} from 'redux';
+import {routerReducer as router} from 'react-router-redux';
+import {reducer as reduxAsyncConnect} from 'redux-connect';
+import {reducer as form} from 'redux-form';
+import {reducer as toastr} from 'react-redux-toastr';
 import global from './modules/global';
 
 export const makeRootReducer = (asyncReducers) => combineReducers({
@@ -14,7 +14,7 @@ export const makeRootReducer = (asyncReducers) => combineReducers({
   toastr,
 });
 
-export const injectReducer = (store, { key, reducer }) => {
+export const injectReducer = (store, {key, reducer}) => {
   store.asyncReducers[key] = reducer; // eslint-disable-line no-param-reassign
   store.replaceReducer(makeRootReducer(store.asyncReducers));
 };
diff --git a/webpack.config-test.babel.js b/webpack.config-test.babel.js
index 95733df..ad3fcf5 100644
--- a/webpack.config-test.babel.js
+++ b/webpack.config-test.babel.js
@@ -1,5 +1,7 @@
-const nodeExternals = require('webpack-node-externals');
+/* eslint import/no-commonjs: 0 */
+
 const path = require('path');
+const nodeExternals = require('webpack-node-externals');
 
 export default {
   target: 'node',
@@ -31,7 +33,7 @@ export default {
         loader: 'style!css?modules',
         include: /flexboxgrid/,
       },
-      { test: /\.(png|jpg)$/, loader: 'url?limit=8192' },
+      {test: /\.(png|jpg)$/, loader: 'url?limit=8192'},
     ],
   },
   resolve: {
diff --git a/webpack.config.js b/webpack.config.js
index 32b90b1..65ef1c5 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,7 +1,7 @@
-/* eslint no-param-reassign: 0 */
+/* eslint no-param-reassign: 0, import/no-commonjs: 0 */
 
-const _ = require('lodash');
 const path = require('path');
+const _ = require('lodash');
 const ip = require('ip');
 const webpack = require('webpack');
 const config = require('config');
@@ -18,7 +18,6 @@ const fixStyleLoader = (loader) => {
   if (!__DEV__) {
     const first = loader.loaders[0];
     const rest = loader.loaders.slice(1);
-    console.log("first: "+first+" , rest:"+rest.join('!'));
     loader.loader = ExtractTextPlugin.extract(first, rest.join('!'));
     delete loader.loaders;
   }
@@ -34,7 +33,7 @@ const getEnvPlugins = () => {
   }
   if (__PROD__) {
     return [
-      new ExtractTextPlugin('[name].[contenthash].css', { allChunks: true }),
+      new ExtractTextPlugin('[name].[contenthash].css', {allChunks: true}),
       new webpack.optimize.OccurrenceOrderPlugin(),
       new webpack.optimize.DedupePlugin(),
       new webpack.optimize.UglifyJsPlugin({
@@ -45,12 +44,12 @@ const getEnvPlugins = () => {
         },
       }),
       new CopyWebpackPlugin([
-        { from: './src/static', to: '.' },
+        {from: './src/static', to: '.'},
       ]),
     ];
   }
   return [
-    new ExtractTextPlugin('[name].[contenthash].css', { allChunks: true }),
+    new ExtractTextPlugin('[name].[contenthash].css', {allChunks: true}),
   ];
 };
 
@@ -158,7 +157,7 @@ module.exports = {
       }),
       fixStyleLoader({
         test: /\.css$/,
-        loaders: ['style','css?modules'],
+        loaders: ['style', 'css?modules'],
         include: /flexboxgrid/,
       }),
       {
@@ -177,12 +176,12 @@ module.exports = {
         test: /\.ttf(\?.*)?$/,
         loader: 'url?prefix=fonts/&name=[path][name].[ext]&limit=10000&mimetype=application/octet-stream',
       },
-      { test: /\.eot(\?.*)?$/, loader: 'file?prefix=fonts/&name=[path][name].[ext]' },
+      {test: /\.eot(\?.*)?$/, loader: 'file?prefix=fonts/&name=[path][name].[ext]'},
       {
         test: /\.svg(\?.*)?$/,
         loader: 'url?prefix=fonts/&name=[path][name].[ext]&limit=10000&mimetype=image/svg+xml',
       },
-      { test: /\.(png|jpg)$/, loader: 'url?limit=8192' },
+      {test: /\.(png|jpg)$/, loader: 'url?limit=8192'},
     ],
   },
   postcss: [