diff --git a/templates/index.html b/templates/index.html
index 767214d..bc2fabf 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -127,13 +127,12 @@
     <script src="{{ url_for('static', filename='jquery-3.6.3.min.js') }}"></script>
     <script>
         $.getJSON( "/config", function( data ) {
-            let times, rand_dom;
             $.each( data, function( computer, user ) {
-                rand_dom = '_' + uuidv4();
-                times = get_times(rand_dom);
+                let rand_dom = '_' + uuidv4();
+                let times = get_times(rand_dom);
                 // todo - click doesn't work and radio spans accross users'
                 $("#people").append(
-                    "<span class='user' id='" + user + "'>" +
+                    "<span class='user' id='" + user + rand_dom + "'>" +
                         "<p  class='h3'>" + user + "<span class='notify loading'></span></p>" +
                         "<span class='time_wrapper'>" +
                             "Unused: <span class='time time_left'>...</span> " +
@@ -156,15 +155,15 @@
                     "</span>"
                 );
 
-                $('#' + user + " .notify").show().html("Loading...");
-                $('#' + user + ' .btn').addClass("disabled");
-                $('#' + user + ' .btn-check').addClass("disabled");
+                $('#' + user  + rand_dom + " .notify").show().html("Loading...");
+                $('#' + user + rand_dom + ' .btn').addClass("disabled");
+                $('#' + user  + rand_dom + ' .btn-check').addClass("disabled");
 
                 setInterval(function () {
-                    $('#' + user + " .loading").fadeIn(1300).fadeOut(1300);
+                    $('#' + user  + rand_dom + " .loading").fadeIn(1300).fadeOut(1300);
                 }, 1400);
                 $.getJSON( "/get_usage/" + computer + "/" + user, function( usage ) {
-                    render_user_to_dom(user, computer, usage);
+                    render_user_to_dom(user, computer, usage, rand_dom);
                 });
             });
         });
@@ -185,19 +184,17 @@
             });
         }
 
-        function add_click_handler(){
-            $(".save_me" ).click(function() {
-                console.log('test');
-                const user = $( this ).attr('user');
+        function add_click_handler(user, rand_dom){
+            $("#" + user + rand_dom + " .save_me" ).click(function() {
                 const computer = $( this ).attr('computer');
-                const action = $( '#' + user + ' input[name="action"]:checked').val();
-                const seconds = $( '#' + user + ' input[name="seconds"]:checked').val();
+                const action = $( '#' + user + rand_dom + ' input[name="action"]:checked').val();
+                const seconds = $( '#' + user + rand_dom + ' input[name="seconds"]:checked').val();
                 if(action !== undefined && seconds !== undefined){
                     $('input').prop('checked', false);
-                    add_or_remove_time(user, computer, action, seconds);
-                    $( '#' + user + ' .notify').html('Updated!').fadeIn(function() {
+                    add_or_remove_time(user, computer, action, seconds, rand_dom);
+                    $( '#' + user + rand_dom + ' .notify').html('Updated!').fadeIn(function() {
                         setTimeout(function() {
-                            $('#' + user + ' .notify').fadeOut("slow");
+                            $('#' + user + rand_dom + ' .notify').fadeOut("slow");
                         }, 1000);
                     });
                 } else {
@@ -206,22 +203,22 @@
             });
         }
 
-        function render_user_to_dom(user, computer, usage){
+        function render_user_to_dom(user, computer, usage, rand_dom){
             if(usage.result === 'success') {
-                $( '#' + user + ' .notify').fadeOut().html('Loaded!').fadeIn(function() {
+                $( '#' + user + rand_dom + ' .notify').fadeOut().html('Loaded!').fadeIn(function() {
                     setTimeout(function() {
-                        $('#' + user + ' .notify').fadeOut("slow");
+                        $('#' + user + rand_dom + ' .notify').fadeOut("slow");
                     }, 1000);
                 });
-                $('#' + user + " .time_left").html(secondsToHms(usage.time_left));
-                $('#' + user + " .time_spent").html(secondsToHms(usage.time_spent));
-                $('#' + user + " .loading").removeClass('loading');
-                $('#' + user + ' .btn').removeClass("disabled");
-                $('#' + user + ' .btn-check').removeClass("disabled");
-                add_click_handler();
+                $('#' + user + rand_dom + " .time_left").html(secondsToHms(usage.time_left));
+                $('#' + user + rand_dom + " .time_spent").html(secondsToHms(usage.time_spent));
+                $('#' + user + rand_dom + " .loading").removeClass('loading');
+                $('#' + user + rand_dom + ' .btn').removeClass("disabled");
+                $('#' + user + rand_dom + ' .btn-check').removeClass("disabled");
+                add_click_handler(user, rand_dom);
             } else {
-                $('#' + user + " .time_wrapper").html("Connection to " + computer + " failed. Off? Conf.py wrong? Bad Auth?");
-                $('#' + user + " .notify").addClass("error").html("Error");
+                $('#' + user + rand_dom + " .time_wrapper").html(computer + " failed. Off? Bad Auth?");
+                $('#' + user + rand_dom + " .notify").addClass("error").html("Error");
             }
         }
 
@@ -229,17 +226,16 @@
 
         }
 
-        function add_or_remove_time(user, computer, action, seconds){
+        function add_or_remove_time(user, computer, action, seconds, rand_dom){
             let form;
             if(action === 'add'){
                 form = 'increase_time'
             } else {
                 form = 'decrease_time'
             }
-            console.log("add_or_remove_time callded: form", form,"computer", computer,"user",user,"seconds",seconds);
             $.getJSON("/" + form + "/" + computer + "/" + user + "/" + seconds, function( data ) {
-                $('#' + user + " .time_left").html(secondsToHms(data.time_left));
-                $('#' + user + " .time_spent").html(secondsToHms(data.time_spent));
+                $('#' + user + rand_dom + " .time_left").html(secondsToHms(data.time_left));
+                $('#' + user + rand_dom + " .time_spent").html(secondsToHms(data.time_spent));
             });
         }
 
diff --git a/timekpr-next-remote.png b/timekpr-next-remote.png
index aa46f8f..fbde2da 100644
Binary files a/timekpr-next-remote.png and b/timekpr-next-remote.png differ