diff --git a/js/api.js b/js/api.js
index 92b9753..84ae430 100644
--- a/js/api.js
+++ b/js/api.js
@@ -1,7 +1,12 @@
-import { createStore, applyMiddleware, combineReducers } from 'redux';
+import {
+    createStore,
+    applyMiddleware,
+    combineReducers
+} from 'redux';
 import { composeWithDevTools } from 'redux-devtools-extension';
-import thunkMiddleware from 'redux-thunk';
-import { errorMessages } from './constants';
+import thunkMiddleware         from 'redux-thunk';
+
+import { errorMessages }       from './constants';
 
 const axios = require('axios');
 
diff --git a/js/components/EditableStringList.js b/js/components/EditableStringList.js
index 64ef704..08bf284 100644
--- a/js/components/EditableStringList.js
+++ b/js/components/EditableStringList.js
@@ -1,5 +1,11 @@
 import React from 'react';
-import { Alert, Button, Input, InputGroup, InputGroupAddon } from 'reactstrap';
+import { 
+    Alert,
+    Button, 
+    Input, 
+    InputGroup, 
+    InputGroupAddon 
+} from 'reactstrap';
 
 export default class EditableStringList extends React.Component {
     constructor(props) {
diff --git a/js/components/ErrorComponents.js b/js/components/ErrorComponents.js
index 8515ec2..beb7a0d 100644
--- a/js/components/ErrorComponents.js
+++ b/js/components/ErrorComponents.js
@@ -1,9 +1,12 @@
-import Head from 'next/head';
-import React from 'react';
+import Head                   from 'next/head';
+import React                  from 'react';
+import { Container }          from 'reactstrap';
+
 import { TurniereNavigation } from './Navigation';
-import { Footer } from './Footer'
+import { Footer }             from './Footer';
+
 import 'bootstrap/dist/css/bootstrap.min.css';
-import {Container} from 'reactstrap';
+
 import '../../static/everypage.css';
 import '../../static/css/error.css';
 
diff --git a/js/components/Login.js b/js/components/Login.js
index 13861fa..f447f90 100644
--- a/js/components/Login.js
+++ b/js/components/Login.js
@@ -8,9 +8,10 @@ import {
     Input,
     Button
 } from 'reactstrap';
-import React from 'react';
+import React       from 'react';
 import { connect } from 'react-redux';
-import { login } from '../api';
+
+import { login }   from '../api';
 
 export function Login(props) {
     return (
diff --git a/js/components/Navigation.js b/js/components/Navigation.js
index 69a5e11..b9d0775 100644
--- a/js/components/Navigation.js
+++ b/js/components/Navigation.js
@@ -11,8 +11,9 @@ import {
     NavLink
 } from 'reactstrap';
 import { connect } from 'react-redux';
-import React from 'react';
-import { login, logout } from '../api';
+import React       from 'react';
+
+import { logout }  from '../api';
 
 export class TurniereNavigation extends React.Component {
 
diff --git a/js/redux/reduxStoreBinder.js b/js/redux/reduxStoreBinder.js
index 179d2a0..fe4499e 100644
--- a/js/redux/reduxStoreBinder.js
+++ b/js/redux/reduxStoreBinder.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React               from 'react';
 import { initializeStore } from '../api';
 
 const isServer = typeof window === 'undefined';
diff --git a/pages/_app.js b/pages/_app.js
index 39529b0..ba56534 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -1,8 +1,9 @@
-import App, {Container} from 'next/app';
-import React from 'react';
-import { Provider } from 'react-redux';
-import withReduxStore from '../js/redux/reduxStoreBinder';
-import Notifications from 'react-notify-toast';
+import { App, Container } from 'next/app';
+import React              from 'react';
+import { Provider }       from 'react-redux';
+import Notifications      from 'react-notify-toast';
+
+import withReduxStore     from '../js/redux/reduxStoreBinder';
 
 class TurniereApp extends App {
 
diff --git a/pages/_error.js b/pages/_error.js
index c0babdc..29a2c44 100644
--- a/pages/_error.js
+++ b/pages/_error.js
@@ -1,9 +1,7 @@
-import { ErrorPageComponent } from '../js/components/ErrorComponents.js';
-import React from 'react';
+import React                  from 'react';
 
-import {
-    verifyCredentials
-} from '../js/api';
+import { ErrorPageComponent } from '../js/components/ErrorComponents';
+import { verifyCredentials }  from '../js/api';
 
 export default class Error extends React.Component {
     static getInitialProps({ res, err }) {
diff --git a/pages/create.js b/pages/create.js
index af79e00..b8ad288 100644
--- a/pages/create.js
+++ b/pages/create.js
@@ -1,11 +1,6 @@
-import Head from 'next/head';
-import '../static/everypage.css';
-import { TurniereNavigation } from '../js/components/Navigation';
-import { Footer } from '../js/components/Footer.js';
-import { UserRestrictor, Option } from '../js/components/UserRestrictor';
-import { Login } from '../js/components/Login.js';
-import React from 'react';
-import { connect } from 'react-redux';
+import Head                       from 'next/head';
+import React                      from 'react';
+import { connect }                from 'react-redux';
 
 import {
     Button,
@@ -20,11 +15,14 @@ import {
     Label
 } from 'reactstrap';
 
-import {
-    verifyCredentials
-} from '../js/api';
+import { TurniereNavigation }     from '../js/components/Navigation';
+import { Footer }                 from '../js/components/Footer';
+import { UserRestrictor, Option } from '../js/components/UserRestrictor';
+import { Login }                  from '../js/components/Login';
+import { verifyCredentials }      from '../js/api';
+import EditableStringList         from '../js/components/EditableStringList';
 
-import EditableStringList from '../js/components/EditableStringList';
+import '../static/everypage.css';
 
 class PrivateCreatePage extends React.Component {
 
diff --git a/pages/faq.js b/pages/faq.js
index b00056b..c861b13 100644
--- a/pages/faq.js
+++ b/pages/faq.js
@@ -1,15 +1,15 @@
-import Head from 'next/head';
-import React from 'react';
-import {Col, Container, Row} from 'reactstrap';
-import 'bootstrap/dist/css/bootstrap.min.css';
-import { TurniereNavigation } from '../js/components/Navigation';
-import { BigImage } from '../js/components/BigImage';
-import { Footer } from '../js/components/Footer.js';
-import '../static/everypage.css';
+import Head                    from 'next/head';
+import React                   from 'react';
+import { Col, Container, Row } from 'reactstrap';
 
-import {
-    verifyCredentials
-} from '../js/api';
+import { TurniereNavigation }  from '../js/components/Navigation';
+import { BigImage }            from '../js/components/BigImage';
+import { Footer }              from '../js/components/Footer';
+import { verifyCredentials }   from '../js/api';
+
+import 'bootstrap/dist/css/bootstrap.min.css';
+
+import '../static/everypage.css';
 
 function Main() {
     return (
diff --git a/pages/imprint.js b/pages/imprint.js
index c0e7628..40d58a9 100644
--- a/pages/imprint.js
+++ b/pages/imprint.js
@@ -1,15 +1,14 @@
-import Head from 'next/head';
-import React from 'react';
-import {Container} from 'reactstrap';
-import 'bootstrap/dist/css/bootstrap.min.css';
-import { TurniereNavigation } from '../js/components/Navigation';
-import { BigImage } from '../js/components/BigImage';
-import { Footer } from '../js/components/Footer.js';
-import '../static/everypage.css';
+import Head                   from 'next/head';
+import React                  from 'react';
+import { Container }          from 'reactstrap';
 
-import {
-    verifyCredentials
-} from '../js/api';
+import { TurniereNavigation } from '../js/components/Navigation';
+import { BigImage }           from '../js/components/BigImage';
+import { Footer }             from '../js/components/Footer';
+import { verifyCredentials }  from '../js/api';
+
+import 'bootstrap/dist/css/bootstrap.min.css';
+import '../static/everypage.css';
 
 function Main() {
     return (
diff --git a/pages/index.js b/pages/index.js
index 3bcbbd1..77c93eb 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -1,23 +1,25 @@
-import Head from 'next/head';
-import React from 'react';
-
-import { Alert, Button, Card, CardBody } from 'reactstrap';
-
-import 'bootstrap/dist/css/bootstrap.min.css';
+import Head                   from 'next/head';
+import React                  from 'react';
+import { connect }            from 'react-redux';
+import {
+    Alert,
+    Button,
+    Card,
+    CardBody
+} from 'reactstrap';
 
 import { TurniereNavigation } from '../js/components/Navigation';
-import { BigImage } from '../js/components/BigImage';
-import { Footer } from '../js/components/Footer.js';
-
-import '../static/everypage.css';
-import '../static/css/index.css';
-
-import { connect } from 'react-redux';
-
+import { BigImage }           from '../js/components/BigImage';
+import { Footer }             from '../js/components/Footer';
 import {
     verifyCredentials
 } from '../js/api';
 
+import 'bootstrap/dist/css/bootstrap.min.css';
+
+import '../static/everypage.css';
+import '../static/css/index.css';
+
 function Main() {
     return (
         <div className="main">
diff --git a/pages/list.js b/pages/list.js
index 9a3c015..7e9f018 100644
--- a/pages/list.js
+++ b/pages/list.js
@@ -1,9 +1,13 @@
-import Head from 'next/head';
-import React from 'react';
-import { Card, CardBody, Container } from 'reactstrap';
+import Head                   from 'next/head';
+import React                  from 'react';
+import {
+    Card,
+    CardBody,
+    Container
+} from 'reactstrap';
 
 import { TurniereNavigation } from '../js/components/Navigation';
-import { Footer } from '../js/components/Footer.js';
+import { Footer }             from '../js/components/Footer';
 import {
     getRequest,
     getState,
diff --git a/pages/login.js b/pages/login.js
index 6edb1dd..4bed1e0 100644
--- a/pages/login.js
+++ b/pages/login.js
@@ -1,13 +1,12 @@
-import Head from 'next/head';
-import '../static/everypage.css';
-import { TurniereNavigation } from '../js/components/Navigation';
-import { Footer } from '../js/components/Footer.js';
-import { Login } from '../js/components/Login.js';
-import React from 'react';
+import Head                   from 'next/head';
+import React                  from 'react';
 
-import {
-    verifyCredentials
-} from '../js/api';
+import { TurniereNavigation } from '../js/components/Navigation';
+import { Footer }             from '../js/components/Footer';
+import { Login }              from '../js/components/Login';
+import { verifyCredentials }  from '../js/api';
+
+import '../static/everypage.css';
 
 export default class LoginPage extends React.Component {
 
diff --git a/pages/privacy.js b/pages/privacy.js
index a5c4250..42dca7f 100644
--- a/pages/privacy.js
+++ b/pages/privacy.js
@@ -1,15 +1,15 @@
-import Head from 'next/head';
-import React from 'react';
-import {Container} from 'reactstrap';
-import 'bootstrap/dist/css/bootstrap.min.css';
-import { TurniereNavigation } from '../js/components/Navigation';
-import { BigImage } from '../js/components/BigImage';
-import { Footer } from '../js/components/Footer.js';
-import '../static/everypage.css';
+import Head                   from 'next/head';
+import React                  from 'react';
+import { Container }          from 'reactstrap';
 
-import {
-    verifyCredentials
-} from '../js/api';
+import { TurniereNavigation } from '../js/components/Navigation';
+import { BigImage }           from '../js/components/BigImage';
+import { Footer }             from '../js/components/Footer';
+import { verifyCredentials }  from '../js/api';
+
+import 'bootstrap/dist/css/bootstrap.min.css';
+
+import '../static/everypage.css';
 
 function Main() {
     return (
diff --git a/pages/register.js b/pages/register.js
index a5ce015..91ebc81 100644
--- a/pages/register.js
+++ b/pages/register.js
@@ -1,15 +1,24 @@
-import Head from 'next/head';
-import '../static/everypage.css';
-import { TurniereNavigation } from '../js/components/Navigation';
-import { Footer } from '../js/components/Footer.js';
-import React from 'react';
-import { Button, Card, CardBody, Container, Form, FormGroup, FormText, Input, Label } from 'reactstrap';
-import { register } from '../js/api';
-import { connect } from 'react-redux';
-
+import Head                   from 'next/head';
+import React                  from 'react';
+import { connect }            from 'react-redux';
 import {
-    verifyCredentials
-} from '../js/api';
+    Button,
+    Card,
+    CardBody,
+    Container,
+    Form,
+    FormGroup,
+    FormText,
+    Input,
+    Label
+} from 'reactstrap';
+
+import { TurniereNavigation } from '../js/components/Navigation';
+import { Footer }             from '../js/components/Footer';
+import { register }           from '../js/api';
+import { verifyCredentials }  from '../js/api';
+
+import '../static/everypage.css';
 
 export default class RegisterPage extends React.Component {
 
diff --git a/pages/tournament-edit.js b/pages/tournament-edit.js
index 2614b19..8b0dfae 100644
--- a/pages/tournament-edit.js
+++ b/pages/tournament-edit.js
@@ -1,17 +1,7 @@
-import Head from 'next/head';
-import React from 'react';
-import 'bootstrap/dist/css/bootstrap.min.css';
-import { connect } from 'react-redux';
-import { notify } from 'react-notify-toast';
-
-import { requestTournament } from '../js/api';
-import { TurniereNavigation } from '../js/components/Navigation';
-import { BigImage } from '../js/components/BigImage';
-import { UserRestrictor, Option } from '../js/components/UserRestrictor.js';
-import { Footer } from '../js/components/Footer.js';
-import { Login } from '../js/components/Login.js';
-import { ErrorPageComponent } from '../js/components/ErrorComponents.js';
-
+import Head                       from 'next/head';
+import React                      from 'react';
+import { connect }                from 'react-redux';
+import { notify }                 from 'react-notify-toast';
 import {
     Container,
     Button,
@@ -20,11 +10,20 @@ import {
     Table
 } from 'reactstrap';
 
+import { requestTournament }      from '../js/api';
+import { TurniereNavigation }     from '../js/components/Navigation';
+import { BigImage }               from '../js/components/BigImage';
+import { UserRestrictor, Option } from '../js/components/UserRestrictor';
+import { Footer }                 from '../js/components/Footer';
+import { Login }                  from '../js/components/Login';
+import { ErrorPageComponent }     from '../js/components/ErrorComponents';
 import {
     verifyCredentials,
     updateTeamName
 } from '../js/api';
 
+import 'bootstrap/dist/css/bootstrap.min.css';
+
 import '../static/everypage.css';
 import '../static/css/index.css';
 
diff --git a/pages/tournament-fullscreen.js b/pages/tournament-fullscreen.js
index 21fddff..a7b79d3 100644
--- a/pages/tournament-fullscreen.js
+++ b/pages/tournament-fullscreen.js
@@ -1,4 +1,4 @@
-import Head from 'next/head';
+import Head  from 'next/head';
 import React from 'react';
 
 import {
diff --git a/pages/tournament.js b/pages/tournament.js
index d753724..1b12687 100644
--- a/pages/tournament.js
+++ b/pages/tournament.js
@@ -1,5 +1,6 @@
-import Head from 'next/head';
-import React from 'react';
+import Head                   from 'next/head';
+import React                  from 'react';
+import { connect }            from 'react-redux';
 import {
     Button,
     Card,
@@ -18,21 +19,22 @@ import {
     Row,
     Table
 } from 'reactstrap';
-import { ErrorPageComponent } from '../js/components/ErrorComponents.js';
-import { Footer } from '../js/components/Footer.js';
-import 'bootstrap/dist/css/bootstrap.min.css';
-import { TurniereNavigation } from '../js/components/Navigation';
-import { BigImage } from '../js/components/BigImage';
-import '../static/everypage.css';
-import '../static/css/tournament.css';
-import { connect } from 'react-redux';
 
+import { ErrorPageComponent } from '../js/components/ErrorComponents';
+import { Footer }             from '../js/components/Footer';
+import { TurniereNavigation } from '../js/components/Navigation';
+import { BigImage }           from '../js/components/BigImage';
 import {
     getRequest,
     getState,
     verifyCredentials
 } from '../js/api';
 
+import 'bootstrap/dist/css/bootstrap.min.css';
+
+import '../static/everypage.css';
+import '../static/css/tournament.css';
+
 class TournamentPage extends React.Component {
 
     render() {