diff --git a/data/www/js/fleet.js b/data/www/js/fleet.js
index 1a8cf09..aca41d8 100644
--- a/data/www/js/fleet.js
+++ b/data/www/js/fleet.js
@@ -51,7 +51,7 @@ jQuery(document).ready(function ($) {
 
     $(document).on('change', 'input[type=checkbox]', function () {
         $.ajax({
-            url: 'fleet/screen/toggle',
+            url: '/fleet/screen/toggle',
             headers: {'Content-Type': 'application/json'},
             data: JSON.stringify({id: getId($(this)), enabled: $(this).is(':checked')}),
             method: 'POST',
diff --git a/data/www/js/slideshow.js b/data/www/js/slideshow.js
index ec56592..68bf91f 100644
--- a/data/www/js/slideshow.js
+++ b/data/www/js/slideshow.js
@@ -51,7 +51,7 @@ jQuery(document).ready(function ($) {
 
     $(document).on('change', 'input[type=checkbox]', function () {
         $.ajax({
-            url: 'slideshow/slide/toggle',
+            url: '/slideshow/slide/toggle',
             headers: {'Content-Type': 'application/json'},
             data: JSON.stringify({id: getId($(this)), enabled: $(this).is(':checked')}),
             method: 'POST',
diff --git a/obscreen.py b/obscreen.py
index 49f9551..be46a86 100755
--- a/obscreen.py
+++ b/obscreen.py
@@ -81,9 +81,10 @@ def inject_global_vars():
 
 PlayerController(app, LANGDICT, slide_manager)
 SlideshowController(app, LANGDICT, slide_manager)
-FleetController(app, LANGDICT, screen_manager)
 SysinfoController(app, LANGDICT)
 
+if config['fleet_enabled']:
+    FleetController(app, LANGDICT, screen_manager)
 
 @app.errorhandler(404)
 def not_found(e):
diff --git a/src/controller/FleetController.py b/src/controller/FleetController.py
index 2880610..ec388cb 100644
--- a/src/controller/FleetController.py
+++ b/src/controller/FleetController.py
@@ -13,14 +13,14 @@ class FleetController:
         self.register()
 
     def register(self):
-        self._app.add_url_rule('/fleet', 'fleet', self.fleet, methods=['GET'])
+        self._app.add_url_rule('/fleet/screen/list', 'fleet_screen_list', self.fleet_screen_list, methods=['GET'])
         self._app.add_url_rule('/fleet/screen/add', 'fleet_screen_add', self.fleet_screen_add, methods=['POST'])
         self._app.add_url_rule('/fleet/screen/edit', 'fleet_screen_edit', self.fleet_screen_edit, methods=['POST'])
         self._app.add_url_rule('/fleet/screen/toggle', 'fleet_screen_toggle', self.fleet_screen_toggle, methods=['POST'])
         self._app.add_url_rule('/fleet/screen/delete', 'fleet_screen_delete', self.fleet_screen_delete, methods=['DELETE'])
         self._app.add_url_rule('/fleet/screen/position', 'fleet_screen_position', self.fleet_screen_position, methods=['POST'])
 
-    def fleet(self):
+    def fleet_screen_list(self):
         return render_template(
             'fleet/fleet.jinja.html',
             l=self._l,
@@ -34,11 +34,11 @@ class FleetController:
             host=request.form['host'],
             port=request.form['port'],
         ))
-        return redirect(url_for('fleet'))
+        return redirect(url_for('fleet_screen_list'))
 
     def fleet_screen_edit(self):
         self._screen_manager.update_form(request.form['id'], request.form['name'], request.form['host'], request.form['port'])
-        return redirect(url_for('fleet'))
+        return redirect(url_for('fleet_screen_list'))
 
     def fleet_screen_toggle(self):
         data = request.get_json()
diff --git a/views/base.jinja.html b/views/base.jinja.html
index 36164c5..ce06127 100755
--- a/views/base.jinja.html
+++ b/views/base.jinja.html
@@ -30,8 +30,8 @@
                         </a>
                     </li>
                     {% if FLEET_MODE %}
-                    <li class="{{ 'active' if request.url_rule.endpoint == 'fleet' }}">
-                        <a href="{{ url_for('fleet') }}">
+                    <li class="{{ 'active' if request.url_rule.endpoint == 'fleet_screen_list' }}">
+                        <a href="{{ url_for('fleet_screen_list') }}">
                             <i class="fa fa-tv"></i> {{ l.fleet_page_title }}
                         </a>
                     </li>