diff --git a/src/app.py b/src/app.py
index 154e86b..ed1497e 100755
--- a/src/app.py
+++ b/src/app.py
@@ -12,7 +12,7 @@
 from werkzeug.exceptions import HTTPException
 
 from blueprint.views import frontend
-from services.dings import OscContext
+from services.live import LiveContext
 
 
 app = Flask(__name__)
@@ -37,15 +37,15 @@
 thread = None
 thread_lock = Lock()
 
-''' Mididings OSC context '''
-dings_context = None
+''' Mididings and OSC context '''
+live_context = None
 if not app.debug or os.environ.get("WERKZEUG_RUN_MAIN") == "true":
-    dings_context = OscContext(
+    live_context = LiveContext(
         configuration["osc_server"])
 
 
 """  Bluebrint(s) """
-app.config['dings_context'] = dings_context
+app.config['live_context'] = live_context.scene_context
 app.register_blueprint(frontend)
 
 
@@ -117,15 +117,9 @@ def api_restart():
 
 
 def mididings_context_update():
-    dings_context.dirty = False
-    socketio.emit('mididings_context_update', {
-                  'current_scene': dings_context.current_scene,
-                  'current_subscene': dings_context.current_subscene,
-                  'scenes': dings_context.scenes,
-                  "scene_name" : dings_context.scene_name,
-                  "subscene_name" : dings_context.subscene_name,
-                  "has_subscene" : dings_context.has_subscene
-                  })
+    live_context.set_dirty(False)
+    socketio.emit('mididings_context_update',
+                  live_context.scene_context.payload)
 
 
 @socketio.event
@@ -192,58 +186,59 @@ def sio_quit():
     socketio.emit("on_terminate")
 
 
-
 ''' Mididings  '''
 
 
 def osc_observer_thread():
     while True:
-        if dings_context.dirty:
+        if live_context.is_dirty():
             mididings_context_update()
-        socketio.emit("on_start") if dings_context.running else socketio.emit("on_exit")
+        socketio.emit("on_start") if live_context.is_running(
+        ) else socketio.emit("on_exit")
         socketio.sleep(0.125)
 
 
 ''' API calls  '''
 
+
 def _quit():
-    dings_context.quit()
+    live_context.quit()
 
 
 def _panic():
-    dings_context.panic()
+    live_context.panic()
 
 
 def _query():
-    dings_context.query()
+    live_context.query()
 
 
 def _restart():
-    dings_context.restart()
+    live_context.restart()
 
 
 def _next_subscene():
-    dings_context.next_subscene()
+    live_context.next_subscene()
 
 
 def _next_scene():
-    dings_context.next_scene()
+    live_context.next_scene()
 
 
 def _prev_subscene():
-    dings_context.prev_subscene()
+    live_context.prev_subscene()
 
 
 def _prev_scene():
-    dings_context.prev_scene()
+    live_context.prev_scene()
 
 
 def _switch_scene(id):
-    dings_context.switch_scene(id)
+    live_context.switch_scene(id)
 
 
 def _switch_subscene(id):
-    dings_context.switch_subscene(id)
+    live_context.switch_subscene(id)
 
 
 '''
diff --git a/src/blueprint/templates/ui.html b/src/blueprint/templates/ui.html
index 4591b21..821d513 100644
--- a/src/blueprint/templates/ui.html
+++ b/src/blueprint/templates/ui.html
@@ -82,7 +82,8 @@ <h3>
                     <input class="btn btn-block btn-info" type="button" id="prev_scene" value="Previous Scene">
                 </div>
                 <div class="col-md-3">
-                    <input class="btn btn-block btn-primary" type="button" id="prev_subscene" value="Previous Sub-Scene">
+                    <input class="btn btn-block btn-primary" type="button" id="prev_subscene"
+                        value="Previous Sub-Scene">
                 </div>
                 <div class="col-md-3">
                     <input class="btn btn-block btn-primary" type="button" id="next_subscene" value="Next Sub-Scene">
@@ -99,151 +100,155 @@ <h3>
 
 {% endblock body %} {% block websockets %}
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.4.0/socket.io.js" integrity="sha512-nYuHvSAhY5lFZ4ixSViOwsEKFvlxHMU2NHts1ILuJgOS6ptUmAGt/0i5czIgMOahKZ6JN84YFDA+mCdky7dD8A==" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.4.0/socket.io.js"
+    integrity="sha512-nYuHvSAhY5lFZ4ixSViOwsEKFvlxHMU2NHts1ILuJgOS6ptUmAGt/0i5czIgMOahKZ6JN84YFDA+mCdky7dD8A=="
+    crossorigin="anonymous"></script>
 
 <script type="text/javascript" charset="utf-8">
-    $(document).ready(function() {
+    $(document).ready(function () {
 
         var socket = io()
 
-        socket.on('connect', function() {
+        socket.on('connect', function () {
             socket.emit('sio_get_mididings_context');
             $('#websockets').html('<div class="bg-success">ONLINE</div>');
             $('#mididings').html('<div class="bg-success">RUNNING</div>');
         });
 
-        socket.on('on_exit', function() {
+        socket.on('on_exit', function () {
             $('#mididings').html('<div class="bg-danger">STOPPED</div>');
         });
 
-        socket.on('on_start', function() {
+        socket.on('on_start', function () {
             $('#mididings').html('<div class="bg-success">RUNNING</div>');
         });
 
-        socket.on('on_terminate', function() {
+        socket.on('on_terminate', function () {
             socket.disconnect();
             $('#websockets').html('<div class="bg-danger">DISCONNECTED</div>');
             $('#mididings').html('<div class="bg-danger">STOPPED</div>');
         });
 
-        socket.on('mididings_context_update', function(ld) {
-
-            $('#current_scene').text(ld.current_scene);
-            $('#current_scene_name').text(ld.scene_name);
-
-            $('#current_subscene').text(ld.current_subscene);
-            $('#current_subscene_name').text(ld.subscene_name);
-
+        socket.on('mididings_context_update', function (context) {
+            //
             // Redraw the content section
-            $('#scenes').text('');
-            $('#subscenes').text('');
-
-            var html = ""
-            var cpt_s = 0;
+            //                
+            var count = 0;
+            var content = "";
+            var subscenes = [];
 
             // Scenes
-            for (let scene_id in ld.scenes) {
+            for (let index in context.items) {
 
-                if (cpt_s % 2 == 0)
-                    html += "<div class='row mt-1 mb-1'>";
+                var scene = context.items[index];
+
+                if (count % 2 == 0)
+                    content += "<div class='row mt-1 mb-1'>";
 
                 // Button style
                 var button_class = "'btn btn-block switch_scene ";
-                if (parseInt(scene_id) == ld.current_scene)
+                if (scene.current)
+                {
+                    $('#current_scene').text(scene.id);
+                    $('#current_scene_name').text(scene.name);
                     button_class += "btn-light'";
+                    subscenes = scene.subscenes;
+                }
                 else
                     button_class += "btn-dark'";
 
-                html += "<div class='col-md-6'>";
-                html += "<input class=" + button_class + " type='button' name='" + scene_id + "' value='" + ld.scenes[scene_id][0] + "'>"
-                html += "</div>";
+                content += "<div class='col-md-6'>";
+                content += "<input class=" + button_class + " type='button' name='" + scene.id.toString() + "' value='" + scene.name + "'>";
+                content += "</div>";
 
-                cpt_s++;
+                count++;
 
-                if (cpt_s % 2 == 0)
-                    html += "</div>";
+                if (count % 2 == 0)
+                    content += "</div>";
             }
-            $("#scenes").append(html);
+            $('#scenes').text("");
+            $("#scenes").append(content);
 
 
             // Subscenes 
-            if (ld.has_subscene) {
-
-                cpt_s = 0;
-                html = "";
+            count = 0;
+            content = "";
 
-                for (let subscene_index in ld.scenes[ld.current_scene][1]) {
+            $('#current_subscene_name').text("...");
+            for (let index in subscenes) {
 
-                    if (cpt_s % 4 == 0)
-                        html += "<div class='row mt-1 mb-1'>";
+                var scene = subscenes[index];
 
-                    var subscene_id = parseInt(subscene_index) + 1;
+                if (count % 4 == 0)
+                    content += "<div class='row mt-1 mb-1'>";
 
-                    // Button style
-                    var button_class = "'btn btn-block switch_subscene ";
-                    if (parseInt(subscene_id) == ld.current_subscene)
-                        button_class += "btn-light'";
-                    else
-                        button_class += "btn-secondary'";
-
-                    html += "<div class='col-md-3'>";
-                    html += "<input class=" + button_class + " type='button' name='" + subscene_id.toString() + "' value='" + ld.scenes[ld.current_scene][1][subscene_index] + "'>"
-                    html += "</div>";
+                // Button style
+                var button_class = "'btn btn-block switch_subscene ";
+                if (scene.current) {
+                    button_class += "btn-light'";
+                    $('#current_subscene').text(scene.id);
+                    $('#current_subscene_name').text(scene.name);
+                }
+                else
+                    button_class += "btn-secondary'";
 
-                    cpt_s++;
+                content += "<div class='col-md-3'>";
+                content += "<input class=" + button_class + " type='button' name='" + scene.id.toString() + "' value='" + scene.name + "'>";
+                content += "</div>";
 
-                    if (cpt_s % 4 == 0)
-                        html += "</div>";
-                }
-                $('#subscenes').append(html);
+                count++;
 
+                if (count % 4 == 0)
+                    content += "</div>";
             }
+            $('#subscenes').text("");
+            $('#subscenes').append(content);
 
         });
 
         // Scene navigation delegate
-        $("#scenes").delegate("input.switch_scene", "click", function(event) {
+        $("#scenes").delegate("input.switch_scene", "click", function (event) {
             return emit('sio_switch_scene', {
                 id: $(this).attr('name')
             });
         });
 
         // Sub-Scene navigation delegate
-        $("#subscenes").delegate("input.switch_subscene", "click", function(event) {
+        $("#subscenes").delegate("input.switch_subscene", "click", function (event) {
             return emit('sio_switch_subscene', {
                 id: $(this).attr('name')
             });
         });
 
-        $('#next_scene').click(function(event) {
+        $('#next_scene').click(function (event) {
             return emit('sio_next_scene');
         });
 
-        $('#prev_scene').click(function(event) {
+        $('#prev_scene').click(function (event) {
             return emit('sio_prev_scene');
         });
 
-        $('#next_subscene').click(function(event) {
+        $('#next_subscene').click(function (event) {
             return emit('sio_next_subscene');
         });
 
-        $('#prev_subscene').click(function(event) {
+        $('#prev_subscene').click(function (event) {
             return emit('sio_prev_subscene');
         });
 
-        $('#restart').click(function(event) {
+        $('#restart').click(function (event) {
             return emit('sio_restart');
         });
 
-        $('#panic').click(function(event) {
+        $('#panic').click(function (event) {
             return emit('sio_panic');
         });
 
-        $('#query').click(function(event) {
+        $('#query').click(function (event) {
             return emit('sio_query');
         });
 
-        $('#quit').click(function(event) {
+        $('#quit').click(function (event) {
             return emit('sio_quit');
         });
 
diff --git a/src/blueprint/views.py b/src/blueprint/views.py
index 004cd9d..5c3c742 100644
--- a/src/blueprint/views.py
+++ b/src/blueprint/views.py
@@ -9,5 +9,5 @@
 
 @frontend.route("/")
 def index():
-    context = current_app.config['dings_context']
+    context = current_app.config['live_context']
     return render_template('ui.html') if context.scenes else render_template('no_ui.html')
diff --git a/src/services/dings.py b/src/services/dings.py
deleted file mode 100644
index ad4f834..0000000
--- a/src/services/dings.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-
-'''
-    This class is the equivalent of the mididings.live.livedings.LiveDings
-'''
-
-
-import liblo
-from mididings.live.osc_control import LiveOSC
-
-
-class OscContext:
-    def __init__(self, options):
-
-        self.osc = LiveOSC(
-            self, options["control_port"], options["listen_port"])
-
-        self.osc.start()
-
-        self.current_scene = -1
-        self.scene_name = ""
-
-        self.current_subscene = -1
-        self.subscene_name = ""
-
-        self.has_subscene = False
-
-        self.data_offset = -1
-        self.scenes = {}
-        
-        self.dirty = False
-        self.running = False
-
-        self.osc.query()
-
-    def next_scene(self):
-        self.osc.next_scene()
-
-    def next_subscene(self):
-        self.osc.next_subscene()
-
-    def prev_scene(self):
-        self.osc.prev_scene()
-
-    def prev_subscene(self):
-        self.osc.prev_subscene()
-
-    def panic(self):
-        self.osc.panic()
-
-    def restart(self):
-        self.osc.restart()
-
-    def query(self):
-        self.osc.query()
-
-    def quit(self):
-        self.osc.quit()
-
-    def switch_scene(self, value):
-        self.osc.switch_scene(value)
-
-    def switch_subscene(self, value):
-        self.osc.switch_subscene(value)
-
-    ''' LiveOSC callbacks '''
-
-    def set_data_offset(self, data_offset):
-        self.data_offset = data_offset
-
-    def set_scenes(self, value):
-        self.scenes = value
-
-    def set_current_scene(self, scene, subscene):
-        self.current_scene = scene
-        self.current_subscene = subscene
-
-        self.scene_name = self.scenes[scene][0]
-
-        self.has_subscene = self.scenes[scene][1]
-        self.subscene_name = self.scenes[scene][1][subscene-1] if self.has_subscene else "..."        
-
-        # This is the last OSC operation from /query
-        self.dirty = True
-        self.running = True
-
-    def on_start(self):
-        ''' Engine start '''
-        self.running = True
-
-    def on_exit(self):
-        ''' Engine stopped '''
-        self.running = False
diff --git a/src/services/live.py b/src/services/live.py
new file mode 100644
index 0000000..91da4c9
--- /dev/null
+++ b/src/services/live.py
@@ -0,0 +1,163 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+
+'''
+    This module is the equivalent of the mididings.live.livedings.LiveDings
+'''
+
+
+import liblo
+from mididings.live.osc_control import LiveOSC
+
+
+class LiveContext:
+    def __init__(self, options) -> None:
+        self.scene_context = SceneContext()
+        self.server = OscContext(options, self.scene_context)
+
+    def is_dirty(self):
+        return self.server.dirty
+
+    def set_dirty(self, value):
+        self.server.dirty = value
+
+    def is_running(self):
+        return self.server.running
+
+    def next_scene(self):
+        self.server.osc.next_scene()
+
+    def next_subscene(self):
+        self.server.osc.next_subscene()
+
+    def prev_scene(self):
+        self.server.osc.prev_scene()
+
+    def prev_subscene(self):
+        self.server.osc.prev_subscene()
+
+    def panic(self):
+        self.server.osc.panic()
+
+    def restart(self):
+        self.server.osc.restart()
+
+    def query(self):
+        self.server.osc.query()
+
+    def quit(self):
+        self.server.osc.quit()
+
+    def switch_scene(self, value):
+        self.server.osc.switch_scene(value)
+
+    def switch_subscene(self, value):
+        self.server.osc.switch_subscene(value)
+
+
+class OscContext:
+    def __init__(self, options, scene_context):
+
+        self.osc = LiveOSC(
+            self, options["control_port"], options["listen_port"])
+
+        self.dirty = False
+        self.running = False
+
+        self.scene_context = scene_context
+
+        self.osc.start()
+        self.osc.query()
+
+    ''' LiveOSC callbacks '''
+
+    '''Data offset'''
+
+    def set_data_offset(self, data_offset):
+        self.scene_context.data_offset = data_offset
+
+    '''Scenes dictionary'''
+
+    def set_scenes(self, scenes):
+        self.scene_context.set_scenes(scenes)
+
+    '''This is the last OSC operation from /query'''
+
+    def set_current_scene(self, cur_scene, cur_subscene):
+        self.scene_context.set_current_scene(cur_scene, cur_subscene)
+
+        self.dirty = True
+        self.running = True
+
+    def on_start(self):
+        ''' Engine start '''
+        self.running = True
+
+    def on_exit(self):
+        ''' Engine stopped '''
+        self.running = False
+
+
+class SceneContext:
+    def __init__(self) -> None:
+        self.data_offset = -1
+        self.scenes = []
+        self.payload = None  # For the UI
+
+    def find(self, id):
+        return next(
+            (candidate for candidate in self.scenes if candidate.id == id), None)
+
+    def set_scenes(self, scenes):
+        ''' Dictionary (int scene_id: tuple(str scene_name, list subscenes))'''
+        self.scenes = []
+        for key, scene_item in scenes.items():
+            scene = Scene(key, scene_item[0])
+            index = 0
+            for subscene_name in scene_item[1]:
+                index += 1
+                scene.subscenes.append(SubScene(index, subscene_name))
+
+            self.scenes.append(scene)
+
+    def set_current_scene(self, cur_scene, cur_subscene):
+        '''Build a friendly dict for the javascript'''
+        items = []
+        for scene in self.scenes:
+            item = {
+                "id": scene.id,
+                "name": scene.name,
+                "current": scene.id == cur_scene
+            }
+
+            subitems = []
+            for subscene in scene.subscenes:
+                subitem = {
+                    "id": subscene.id,
+                    "name": subscene.name,
+                    "current": subscene.id == cur_subscene
+                }
+                subitems.append(subitem)
+
+            item["subscenes"] = subitems
+
+            items.append(item)
+
+        self.payload = {"items": items}
+
+
+class SceneBase:
+    def __init__(self, id, name) -> None:
+        self.id = id
+        self.name = name
+
+
+class Scene(SceneBase):
+    def __init__(self, id, name) -> None:
+        super().__init__(id, name)
+        self.subscenes = []
+
+
+class SubScene(SceneBase):
+    def __init__(self, id, name) -> None:
+        super().__init__(id, name)
diff --git a/src/templates/index.html b/src/templates/index.html
index c456460..3344034 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -4,7 +4,7 @@
 <div class="container">
   <div class="row">
     <div class="col-md-12">
-      <h1>flaskdings</h1>
+      <h1>FlaskDings</h1>
       <h3>An API and UI for MIDIDINGS</h3>
       <h2><a href="/ui">Load UI</a></h></h2>
     </div>