diff --git a/client/.eslintrc.js b/client/.eslintrc.js
index 250847da1..bdd833da9 100644
--- a/client/.eslintrc.js
+++ b/client/.eslintrc.js
@@ -5,9 +5,11 @@ module.exports = {
     'plugin:react/recommended',
   ],
   rules: {
+    'max-len': ['error', 140, 2],
     'no-underscore-dangle': 'off',
     'no-param-reassign': 'off',
     'react/prop-types': 0,
+    'react/jsx-indent': ['error', 2],
   },
   settings: {
     'react': {
diff --git a/client/src/Components/HostedEvents/index.js b/client/src/Components/HostedEvents/index.js
index 20b531949..32989e655 100644
--- a/client/src/Components/HostedEvents/index.js
+++ b/client/src/Components/HostedEvents/index.js
@@ -14,7 +14,7 @@ const HostedEvent = () => (
         if (loading) return 'Loading...';
         if (error) return `Error! ${error.message}`;
         const list = data.events_EventsByHost.map((event, index) => (
-            <Event key={index} event={event} />
+          <Event key={index} event={event} />
         ));
         return (
           <React.Fragment>
diff --git a/client/src/Components/Search/Tabs/Future.js b/client/src/Components/Search/Tabs/Future.js
index 6a83bf3c9..d5dbfc089 100644
--- a/client/src/Components/Search/Tabs/Future.js
+++ b/client/src/Components/Search/Tabs/Future.js
@@ -12,7 +12,7 @@ class Future extends React.Component {
     const { FutureEvents } = this.props;
 
     const futureEvents = FutureEvents.map((event, index) => (
-        <Event key={index} event={event} />
+      <Event key={index} event={event} />
     ));
     return (
       <React.Fragment>
diff --git a/client/src/Components/Search/Tabs/Incoming.js b/client/src/Components/Search/Tabs/Incoming.js
index 94fe6b93b..ab6b070dc 100644
--- a/client/src/Components/Search/Tabs/Incoming.js
+++ b/client/src/Components/Search/Tabs/Incoming.js
@@ -12,10 +12,10 @@ class Incoming extends React.Component {
     const { IncomingEvents, OngoingEvents } = this.props;
 
     const incomingEvents = IncomingEvents.map((event, index) => (
-        <Event key={index} event={event} />
+      <Event key={index} event={event} />
     ));
     const ongoingEvents = OngoingEvents.map((event, index) => (
-        <Event key={index} event={event} />
+      <Event key={index} event={event} />
     ));
     return (
       <React.Fragment>
diff --git a/client/src/Components/Search/Tabs/Past.js b/client/src/Components/Search/Tabs/Past.js
index 5ca060c67..b01cb0684 100644
--- a/client/src/Components/Search/Tabs/Past.js
+++ b/client/src/Components/Search/Tabs/Past.js
@@ -12,7 +12,7 @@ class Past extends React.Component {
     const { PastEvents } = this.props;
 
     const pastEvents = PastEvents.map((event, index) => (
-        <Event key={index} event={event} />
+      <Event key={index} event={event} />
     ));
     return (
       <React.Fragment>
diff --git a/server/.eslintrc.js b/server/.eslintrc.js
index 800621670..c06bffbce 100644
--- a/server/.eslintrc.js
+++ b/server/.eslintrc.js
@@ -2,6 +2,7 @@ module.exports = {
   parser: 'babel-eslint',
   extends: 'airbnb-base',
   rules: {
+    'max-len': ['error', 140, 2],
     'no-underscore-dangle': 'off',
     'no-param-reassign': 'off',
   }