diff --git a/templates/addForm.html b/templates/addForm.html
index 0c5ad79..74725c1 100644
--- a/templates/addForm.html
+++ b/templates/addForm.html
@@ -4,9 +4,11 @@
         <input class="form-control" id="addbox" style="display: inline" type="text" name="item" value=""><br><br>
         <select id="addbox" name="add2list" class="custom-select custom-select-lg mb-3">
             {% for listid in data["list_ids"] %}
-                <option type="submit" value="{{listid}}" id="addbox" name="list">{{id[listid]}}</option>
+            <option type="submit" value="{{listid}}" id="addbox" name="list">{{id[listid]}}</option>
             {% endfor %}
-          </select>
-        <div style="text-align: center; padding-bottom: 2px"><input class="btn btn-secondary" type="submit" style="text-align: center" name="addValue" value="Submit"></form>
+        </select>
+        <div style="text-align: center; padding-bottom: 2px"><input class="btn btn-secondary" type="submit"
+                style="text-align: center" name="addValue" value="Submit">
+    </form>
     </form>
 </div>
\ No newline at end of file
diff --git a/templates/admin.html b/templates/admin.html
index bf49e87..cf5b203 100644
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -16,7 +16,12 @@
                 <tr scope="row">
                     <td>{{x[0]}}</td>
                     <td>{% if x[1] == 1 %} Yes {% else %} No {% endif %}</td>
-                    <td align="right"><form action="/post" method="POST"><input style="width: 70%; display: inline;" class="form-control" type="text" name="newpass" id="addbox"><button class="btn btn-secondary" type="submit" name="updatepass" value="{{x[2]}}"> Change Password </button></form></td>
+                    <td align="right">
+                        <form action="/post" method="POST"><input style="width: 70%; display: inline;"
+                                class="form-control" type="text" name="newpass" id="addbox"><button
+                                class="btn btn-secondary" type="submit" name="updatepass" value="{{x[2]}}"> Change
+                                Password </button></form>
+                    </td>
                 </tr>
                 {% endfor %}
             </tbody>
@@ -25,35 +30,36 @@
     <hr>
     <h1 class="text-center">ADD NEW USERS</h1>
     <div class="container">
-        <form class="loginform"  action="/post" method="POST">
+        <form class="loginform" action="/post" method="POST">
             <div class="form-group row">
-                <label for="addbox" class="col-sm-2 col-form-label" >Username</label>
+                <label for="addbox" class="col-sm-2 col-form-label">Username</label>
                 <div class="col-sm-10">
                     <input type=text class="form-control" id="addbox" type="text" name="username" />
                 </div>
             </div>
             <div class="form-group row">
-                <label for="addbox" class="col-sm-2 col-form-label" >Password</label>
-                    <div class="col-sm-10">
-                        <input class="form-control" id="addbox" type="password" name="password"/>
-                    </div>
-                    <div class="form-group" style="padding-top: 10px; padding-left: 10px;">
-                        <input class="btn btn-secondary" id="logbtn" type="submit" name="newuser" value="Create new account" />
-                    </div>
+                <label for="addbox" class="col-sm-2 col-form-label">Password</label>
+                <div class="col-sm-10">
+                    <input class="form-control" id="addbox" type="password" name="password" />
+                </div>
+                <div class="form-group" style="padding-top: 10px; padding-left: 10px;">
+                    <input class="btn btn-secondary" id="logbtn" type="submit" name="newuser"
+                        value="Create new account" />
+                </div>
             </div>
         </form>
         <h1 class="text-center">ADD LIST</h1>
-        <form class="addList"  action="/post" method="POST">
+        <form class="addList" action="/post" method="POST">
             <div class="form-group row">
-                <label for="addlist" class="col-sm-2 col-form-label" >List</label>
+                <label for="addlist" class="col-sm-2 col-form-label">List</label>
                 <div class="col-sm-10">
                     <input type=text class="form-control" id="addlist" type="text" name="addList" />
                 </div>
             </div>
             <div class="form-group row">
-                    <div class="form-group" style="padding-top: 10px; padding-left: 10px;">
-                        <input class="btn btn-secondary" id="addlist" type="submit" name="newlist" value="Add new list" />
-                    </div>
+                <div class="form-group" style="padding-top: 10px; padding-left: 10px;">
+                    <input class="btn btn-secondary" id="addlist" type="submit" name="newlist" value="Add new list" />
+                </div>
             </div>
         </form>
         <div id="logout" style="padding-top: 3px;">
@@ -67,48 +73,36 @@
     <h1 class="text-center">Add User To List</h1>
     <div class="container">
         <div class="form-group row">
-        <form action="/post" method="POST">
-            <label for="uesrnamelist" class="col-sm-2 col-form-label">User</label>
-            <select id="usernamelist" name="add2list" class="custom-select custom-select-lg mb-3">
-            {% for userid in data["users"] %}
-                <option type="submit" value="{{userid[2]}}" id="addbox" name="User2list" class="form-control">{{userid[0].title()}}</option>
-            {% endfor %}
-          </select>
-          <label for="listlist" class="col-sm-2 col-form-label">List</label>
-          <select id="listlist" name="listID" class="custom-select custom-select-lg mb-3">
-            {% for x in data["lists"] %}
-                <option type="submit" value="{{x}}" id="addbox" name="User2list" class="form-control">{{data["lists"][x]}}</option>
-            {% endfor %}
-          </select>
-          <button class="btn btn-secondary" type="submit" value="x"> Add User To List </button>
-        <!-- <input name="listID" value={{x}} type="hidden">--></form>
+            <form action="/post" method="POST">
+                <div class="form-row">
+                    <div class="col">
+                        <label for="usernamelist" class="col-form-label form-control">User</label>
+                        <select id="usernamelist" name="add2list"
+                            class="custom-select custom-select-lg mb-3 form-control">
+                            {% for userid in data["users"] %}
+                            <option type="submit" value="{{userid[2]}}" id="addbox" name="User2list"
+                                class="form-control">{{userid[0].title()}}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    <div class="col">
+                        <label for="listlist" class="col-form-label form-control">List</label>
+                        <select id="listlist" name="listID" class="custom-select custom-select-lg mb-3 form-control">
+                            {% for x in data["lists"] %}
+                            <option type="submit" value="{{x}}" id="addbox" name="User2list" class="form-control">
+                                {{data["lists"][x]}}</option>
+                            {% endfor %}
+                        </select>
+                        <div class="col">
+                            <button class="btn btn-secondary" type="submit" value="x"> Add
+                                User To List </button>
+                            </div>
+
+                    </div>
+                </div>
+            </form>
+        </div>
     </div>
-        <!-- <table class="table table-striped table-dark table-hover">
-            <thead>
-                <tr>
-                    <th scope="col">Username</th>
-                    <th scope="col">User</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for x in data["lists"] %}
-                <tr scope="row">
-                    <td>{{data["lists"][x]}}</td>
-                    <td><form action="/post" method="POST">
-                        <select id="addbox" name="add2list" class="custom-select custom-select-lg mb-3">
-                        {% for userid in data["users"] %}
-                            <option type="submit" value="{{userid[2]}}" id="addbox" name="User2list">{{userid[0].title()}}</option>
-                        {% endfor %}
-                      </select> <button class="btn btn-secondary" type="submit" value="x"> Add User To List </button>
-                    <input name="listID" value={{x}} type="hidden"></form></td>
-                </tr>
-                {% endfor %}
-            </tbody>
-        </table> -->
-    </div>
-    {% for x in data["lists"] %}
-        {{data["lists"][x]}}
-    {% endfor %}
     <!-- jQuery library -->
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
     <!-- Popper JS -->
diff --git a/templates/index.html b/templates/index.html
index 4da94d5..259539d 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,27 +1,28 @@
 {% include "header.html" %}
 
 <body>
-    <h1 class="container" style="text-align: center">{{ data["title"] }}, {{data["session"]["username"].title()}} 
+    <h1 class="container" style="text-align: center">{{ data["title"] }}, {{data["session"]["username"].title()}}
         <div class="dropdown">
             <form action="/post" method="post" id="test">
-            <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                {% set id  = session["list_ids"] %}
-                {% set actid = session["active_id"] %}
-                {% if actid == "0" %}
-                    ALL 
-                {% else %}
+                <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2"
+                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    {% set id  = session["list_ids"] %}
+                    {% set actid = session["active_id"] %}
+                    {% if actid == "0" %}
+                    ALL
+                    {% else %}
                     {{ id[actid] }}
-                {% endif %}
-            </button>
-            <div class="dropdown-menu" aria-labelledby="dropdownMenu2">
-                <button class="dropdown-item" type="submit" value="0" id="" name="list">All</button>
-                {% for listid in data["list_ids"] %}
-                <button class="dropdown-item" type="submit" value="{{listid}}"  name="list">{{id[listid]}}</button>
-                {% endfor %}
-            </div>
-        </form>
-          </div>
-        </h1>
+                    {% endif %}
+                </button>
+                <div class="dropdown-menu" aria-labelledby="dropdownMenu2">
+                    <button class="dropdown-item" type="submit" value="0" id="" name="list">All</button>
+                    {% for listid in data["list_ids"] %}
+                    <button class="dropdown-item" type="submit" value="{{listid}}" name="list">{{id[listid]}}</button>
+                    {% endfor %}
+                </div>
+            </form>
+        </div>
+    </h1>
     <!-- <aside> -->
     <div id="addForm">
         {% include "addForm.html" %}
diff --git a/templates/mobile.html b/templates/mobile.html
index b4998ee..5016017 100644
--- a/templates/mobile.html
+++ b/templates/mobile.html
@@ -1,35 +1,38 @@
 {% include "header.html" %}
-    <body>
-        <h1 class="container" style="text-align: center">{{ data["title"] }}</h1>
-        <div class="dropdown">
-            <form action="/post" method="post" id="test">
-            <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+
+<body>
+    <h1 class="container" style="text-align: center">{{ data["title"] }}</h1>
+    <div class="dropdown">
+        <form action="/post" method="post" id="test">
+            <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown"
+                aria-haspopup="true" aria-expanded="false">
                 {% set id  = session["list_ids"] %}
                 {% set actid = session["active_id"] %}
                 {% if actid == "0" %}
-                    ALL 
+                ALL
                 {% else %}
-                    {{ id[actid] }}
+                {{ id[actid] }}
                 {% endif %}
             </button>
             <div class="dropdown-menu" aria-labelledby="dropdownMenu2">
                 <button class="dropdown-item" type="submit" value="0" id="" name="list">All</button>
                 {% for listid in data["list_ids"] %}
-                <button class="dropdown-item" type="submit" value="{{listid}}" id="{{id}}" name="list">{{id[listid]}}</button>
+                <button class="dropdown-item" type="submit" value="{{listid}}" id="{{id}}"
+                    name="list">{{id[listid]}}</button>
                 {% endfor %}
             </div>
         </form>
-        <div class="" >
+        <div class="">
             {% include "addForm.html" %}
         </div>
         <div class="container" id="memes">
             {% include "list.html" %}
-
         </div>
         <div id="logout">
             <form action="/post" method="POST">
-                <button  type="submit" name="logout" class="btn btn-secondary"><i style="padding-top: 3px;" class="material-icons">
-                    exit_to_app
+                <button type="submit" name="logout" class="btn btn-secondary"><i style="padding-top: 3px;"
+                        class="material-icons">
+                        exit_to_app
                     </i></button>
             </form>
         </div>
@@ -40,14 +43,12 @@
                         vpn_key
                     </i></button></a>
         </div>
-        
         <!-- jQuery library -->
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-
         <!-- Popper JS -->
         <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js"></script>
-
         <!-- Latest compiled JavaScript -->
-        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"></script> 
-    </body>
-</html>
+        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"></script>
+</body>
+
+</html>
\ No newline at end of file