diff --git a/user_client/v1/index.html b/user_client/v1/index.html
index 68a5c7b..8ab21ef 100644
--- a/user_client/v1/index.html
+++ b/user_client/v1/index.html
@@ -29,29 +29,12 @@
                 <li class="tab col s3 "><a href="#About" style="color: white;">About</a></li>
               </ul>
             </div>
-            
-
-
-        <div id="Home">
-
-        <div class="sticky ontop">
-            <div id="header">
-                <!--<div class="" style="display:flex;">
-                    <div class="headerItem left"><p class="headerText">Home</p></div>
-                </div>
-                <div class="" style="display:flex;">
-                    <div class="headerItem"><p class="headerText">Settings</p></div>
-                    <div class="headerItem"><p class="headerText">About</p></div>
-                </div>-->
-                
-            </div>
-            <!--<a class="btn-floating btn-large waves-effect waves-light red right hide-on-small-and-down" ><i class="material-icons">add</i></a>-->
         </div>
 
-
-        <div id=bodyarea class="row" style="">
-            <div id="sidebar_area" class="col s12 m3 hide-on-small-and-down card" style="position: fixed;">
-                <div style="" onclick="BotStatus()"><p id="BotStatus" class="card noselect" style="padding-left: 3px;padding-right: 3px;">Bot Status: ??</p></div>
+        <div id="Home">
+            <div id="" class="row bodyarea" style="">
+                <div id="sidebar_area" class="col s12 m3 hide-on-small-and-down card" style="position: fixed;">
+                    <div style="" onclick="BotStatus()"><p id="BotStatus" class="card noselect" style="padding-left: 3px;padding-right: 3px;">Bot Status: ??</p></div>
                 <div class="row" style="padding-left: 3px;" style="">
                     <a href="index.html"><div class="s12 card waves-effect waves-light btn-large colsInSideBar" style="background-color: #42A5F5;">
                         <i class="material-icons">arrow_upward</i>
@@ -83,33 +66,75 @@
             </div>
             <div id="main_area" class="col s12 m9 right card">
 
+
                 <div id="Chyron" style="padding-top: 20px;"><div class="rowsInMain center card">
-                    <a class="btn-floating btn-large waves-effect waves-light red right hide-on-small-and-down" style="margin-right: 10px;">
+                    <a class="btn-floating btn-large waves-effect waves-light blue right" style="margin-right: 10px;">
+                        <i class="material-icons">refresh</i>
+                    </a>
+                    <a class="btn-floating btn-large waves-effect waves-light green right" style="margin-right: 10px;">
                         <i class="material-icons">add</i>
-                    </a><h3>Chyron:</h3></div>
+                    </a>
+                    <h3>Chyron:</h3></div>
                 <div class="rowsInMain row card" style="margin-right: 20px;margin-left: 20px;margin-top: 30px;margin-bottom: 30px;">
-                    <div class="col s3"><p>Section Name:</p></div>
-                    <div class="col s3"><p>Title:</p></div>
-                    <div class="col s3"><p>Content:</p></div>
-                    <div class="col s1 switch"><label>Enabled:<input type="checkbox"><span class="lever"></span></label></div>
-                    <div class="col s1 btn red waves-effect"><i class="material-icons">delete</i></div>
+                    <div class="col s12 switch hide" style="top: -20px;position: relative;padding-left: 10px;"><label>Enabled:<input type="checkbox"><span class="lever"></span></label></div>
+                    <div class="col s4"><p>Section Name:</p>
+                        <div class="input-field inline" style="width: 80%;">
+                            <input id="section_name_inline" type="text" class="validate">
+                            <label for="section_name_inline">Section Name</label>
+                        </div>
+                    </div>
+                    <div class="col s4"><p>Title:</p>
+                        <div class="input-field inline" style="width: 80%;">
+                            <input id="title_inline" type="text" class="validate">
+                            <label for="title_inline">Title</label>
+                        </div>
+                    </div>
+                    <div class="col s4"><p>Content:</p>
+                        <div class="input-field inline" style="width: 80%;">
+                            <input id="content_inline" type="text" class="validate">
+                            <label for="content_inline">Text</label>
+                        </div>
+                    </div>
+                    <div style="position: absolute; right: 0; top: 0; width: 3em;" class="col s1 btn red waves-effect"><i class="material-icons">delete</i></div>
                 </div>
-                <div id="Commands" style="padding-top: 20px;"></div><div class="rowsInMain center card">
-                    <a class="btn-floating btn-large waves-effect waves-light red right hide-on-small-and-down hide" style="margin-right: 10px;">
-                        <i class="material-icons">add</i>
-                    </a><h3>Commands:</h3></div>
+
+
+
+                <div id="Commands" style="padding-top: 20px;"><div class="rowsInMain center card">
+                    <a class="btn-floating btn-large waves-effect waves-light blue right" style="margin-right: 10px;">
+                        <i class="material-icons">refresh</i>
+                    </a>
+                    <h3>Commands:</h3></div>
                 <div class="rowsInMain row card" style="margin-right: 20px;margin-left: 20px;margin-top: 30px;margin-bottom: 30px;">
-                    <div class="col s3"><p>Command Name:</p></div>
-                    <div class="col s1 switch"><label>Enabled:<input type="checkbox"><span class="lever"></span></label></div>
+                    <div class="col s12 switch" style="top: -20px;position: relative;padding-left: 10px;"><label>Enabled:<input type="checkbox"><span class="lever"></span></label></div>
+                    <div class="col s4"><p>Command Name:</p>
+                        <div class="input-field inline" style="width: 80%;">
+                            <input disabled id="command_inline " type="text" value="!testerino" class="validate">
+                            <label for="command_inline">Command</label>
+                        </div>
+                    </div>
                 </div>
+                </div>
+
+
+
                 <div id="Rewards" style="padding-top: 20px;"></div><div class="rowsInMain center card">
-                    <a class="btn-floating btn-large waves-effect waves-light red right hide-on-small-and-down hide" style="margin-right: 10px;">
-                        <i class="material-icons">add</i>
-                    </a><h3>Rewards:</h3></div>
+                    <a class="btn-floating btn-large waves-effect waves-light blue right" style="margin-right: 10px;">
+                        <i class="material-icons">refresh</i>
+                    </a>
+                    <h3>Rewards:</h3></div>
                 <div class="rowsInMain row card" style="margin-right: 20px;margin-left: 20px;margin-top: 30px;margin-bottom: 30px;">
-                    <div class="col s3"><p>Reward Name:</p></div>
-                    <div class="col s1 switch"><label>Enabled:<input type="checkbox"><span class="lever"></span></label></div>
+                    <div class="switch" style="top: -20px;position: relative;padding-left: 10px;"><label>Enabled:<input type="checkbox"><span class="lever"></span></label></div>
+                    <div class="col s4"><p>Reward Name:</p>
+                        <div class="input-field inline" style="width: 80%;">
+                            <input disabled id="reward_inline " type="text" value="Hydration" class="validate">
+                            <label for="reward_inline">Reward</label>
+                        </div>
+                    </div>
                 </div>
+
+
+
                 <div id="Timers" style="padding-top: 20px;"></div><div class="rowsInMain center card hide">
                     <a class="btn-floating btn-large waves-effect waves-light red right hide-on-small-and-down" style="margin-right: 10px;">
                         <i class="material-icons">add</i>
@@ -120,69 +145,100 @@
                     <div class="col s3"><p>Trigger_EXEC:</p></div>
                     <div class="col s "><p>O</p></div>
                 </div>
+
+
+
                 <div id="TextSources" style="padding-top: 20px;"></div><div class="rowsInMain center card">
-                    <a class="btn-floating btn-large waves-effect waves-light green right hide-on-small-and-down" style="margin-right: 10px;">
-                        <i class="material-icons">add</i>
-                    </a><h3>Text Sources:</h3></div>
-                <div class="rowsInMain row card" style="margin-right: 20px;margin-left: 20px;margin-top: 30px;margin-bottom: 30px;">
-                    <div class="col s3"><p>File Name:</p></div>
-                    <div class="col s3"><p>Title:</p></div>
-                    <div class="col s3"><p>Text:</p></div>
-                    <div class="col s1 btn red waves-effect"><i class="material-icons ">delete</i></div>
-                </div>
-                <div id="EventHistory" style="padding-top: 20px;"></div><div class="rowsInMain center card">
-                    <a class="btn-floating btn-large waves-effect waves-light blue right hide-on-small-and-down" style="margin-right: 10px;">
+                    <a class="btn-floating btn-large waves-effect waves-light blue right" style="margin-right: 10px;">
                         <i class="material-icons">refresh</i>
-                    </a><h3>Event History:</h3></div>
+                    </a>
+                    <h3>Text Sources:</h3></div>
+                <div class="rowsInMain row card" style="margin-right: 20px;margin-left: 20px;margin-top: 30px;margin-bottom: 30px;">
+                    <div class="col s4"><p>File Name:</p>
+                        <div class="input-field inline" style="width: 80%;">
+                            <input id="filename_inline" type="text" class="validate">
+                            <label for="filename_inline">Text</label>
+                        </div>
+                    </div>
+                    <div class="col s4"><p>Title:</p>
+                        <div class="input-field inline" style="width: 80%;">
+                            <input id="title_inline" type="text" class="validate">
+                            <label for="title_inline">Text</label>
+                        </div>
+                    </div>
+                    <div class="col s4"><p>Text:</p>
+                        <div class="input-field inline" style="width: 80%;">
+                            <input id="text_inline" type="text" class="validate">
+                            <label for="text_inline">Text</label>
+                        </div>
+                    </div>
+                    <div style="position: absolute; right: 0; top: 0; width: 3em;" class="col s1 btn red waves-effect"><i class="material-icons">delete</i></div>
+                </div>
+
+
+
+                <div id="EventHistory" style="padding-top: 20px;"></div><div class="rowsInMain center card">
+                    <a class="btn-floating btn-large waves-effect waves-light blue right" style="margin-right: 10px;">
+                        <i class="material-icons">refresh</i>
+                    </a>
+                    <h3>Event History:</h3></div>
 
                 <div class="EventHistoryWrapper">
                     <div class="rowsInMain row card">
                         <div class="col s3"><p>Event:</p></div>
                         <div class="col s3"><p>User:</p></div>
                         <div class="col s3"><p>Message:</p></div>
-                        <div class="col s1 right"><p>O</p></div>
+                        <a class="btn waves-effect waves-light green right col s1" style="position: absolute; right: 0; top: 0; width: 3em;">
+                            <i class="material-icons">refresh</i>
+                        </a>
                     </div>
                     <div class="rowsInMain row card">
                         <div class="col s3"><p>Event:</p></div>
                         <div class="col s3"><p>User:</p></div>
                         <div class="col s3"><p>Message:</p></div>
-                        <div class="col s1 right"><p>O</p></div>
+                        <a class="btn waves-effect waves-light green right col s1" style="position: absolute; right: 0; top: 0; width: 3em;">
+                            <i class="material-icons">refresh</i>
+                        </a>
                     </div>
                     <div class="rowsInMain row card">
                         <div class="col s3"><p>Event:</p></div>
                         <div class="col s3"><p>User:</p></div>
                         <div class="col s3"><p>Message:</p></div>
-                        <div class="col s1 right"><p>O</p></div>
+                        <a class="btn waves-effect waves-light green right col s1" style="position: absolute; right: 0; top: 0; width: 3em;">
+                            <i class="material-icons">refresh</i>
+                        </a>
                     </div>
                     <div class="rowsInMain row card">
                         <div class="col s3"><p>Event:</p></div>
                         <div class="col s3"><p>User:</p></div>
                         <div class="col s3"><p>Message:</p></div>
-                        <div class="col s1 right"><p>O</p></div>
+                        <a class="btn waves-effect waves-light green right col s1" style="position: absolute; right: 0; top: 0; width: 3em;">
+                            <i class="material-icons">refresh</i>
+                        </a>
                     </div>
                     <div class="rowsInMain row card">
                         <div class="col s3"><p>Event:</p></div>
                         <div class="col s3"><p>User:</p></div>
                         <div class="col s3"><p>Message:</p></div>
-                        <div class="col s1 right"><p>O</p></div>
+                        <a class="btn waves-effect waves-light green right col s1" style="position: absolute; right: 0; top: 0; width: 3em;">
+                            <i class="material-icons">refresh</i>
+                        </a>
                     </div>
                     <div class="rowsInMain row card">
                         <div class="col s3"><p>Event:</p></div>
                         <div class="col s3"><p>User:</p></div>
                         <div class="col s3"><p>Message:</p></div>
-                        <div class="col s1 right"><p>O</p></div>
+                        <a class="btn waves-effect waves-light green right col s1" style="position: absolute; right: 0; top: 0; width: 3em;">
+                            <i class="material-icons">refresh</i>
+                        </a>
                     </div>
                     <div class="rowsInMain row card">
                         <div class="col s3"><p>Event:</p></div>
                         <div class="col s3"><p>User:</p></div>
                         <div class="col s3"><p>Message:</p></div>
-                        <div class="col s1 right"><p>O</p></div>
-                    </div>
-                    <div class="rowsInMain row card">
-                        <div class="col s3"><p>Event:</p></div>
-                        <div class="col s3"><p>User:</p></div>
-                        <div class="col s3"><p>Message:</p></div>
-                        <div class="col s1 right"><p>O</p></div>
+                        <a class="btn waves-effect waves-light green right col s1" style="position: absolute; right: 0; top: 0; width: 3em;">
+                            <i class="material-icons">refresh</i>
+                        </a>
                     </div>
                 </div>
 
@@ -239,16 +295,42 @@
 
                 </div>
 
+                </div>
+            </div>
+
+        </div>
+    </div>
+
+    <div id="Settings"style="padding-top: 20px;">
+        <div class="" >
+            <div class=""style="padding-top: 20px;">
+                <div class="row bodyarea container" style="background-color: rgb(221, 221, 221);">
+                    <div class="rowsInMain center card">
+                        <a class="btn-floating btn-large waves-effect waves-light blue right" style="margin-right: 10px;">
+                            <i class="material-icons">refresh</i>
+                        </a>
+                        <h3>Settings</h3>
+                    </div>
+                    <div class="container">
+                    <div class="col s12">
+                        <div class="card" style="margin-top: 30px;margin-bottom: 30px; min-height: 3em;">
+
+                        </div>
+                    </div>
+                    </div>
+                </div>
             </div>
         </div>
+    </div>
 
+
+    <div id="About" class="">
+        <div class="row bodyarea">
+            <div class="col s12 center">
+                <h1>Made by Alex Orid,<br> The Curious Nerd</h1>
+            </div>
         </div>
-
-
-        <div id="Settings"></div>
-
-
-        <div id="About"></div>
+    </div>
 
 
         <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
diff --git a/user_client/v1/style.css b/user_client/v1/style.css
index fc99f7d..43273b4 100644
--- a/user_client/v1/style.css
+++ b/user_client/v1/style.css
@@ -20,12 +20,12 @@ p {
     display: flex;
 }
 
-#bodyarea{
+.bodyarea{
     background-color: rgb(250, 250, 250);
     padding: 0;
-    padding-top: 4em;
+    padding-top: 3em;
     margin: 0;
-    height: 100%;
+    min-height: 90%;
 }
 
 #sidebar_area{
diff --git a/user_client/v1/webclient.js b/user_client/v1/webclient.js
index 1d111e9..ea29e75 100644
--- a/user_client/v1/webclient.js
+++ b/user_client/v1/webclient.js
@@ -26,14 +26,14 @@ fetch_GetList = (fetchURL) => response = fetch(fetchURL)
 
 GetList = async (listType) => {
     if (true) {
-        ListRequestOBJ = {
+        let ListRequestOBJ = {
             'request_name': listType,
             'request_type': "list"
         }
-        params = "?request_name="+encodeURIComponent(ListRequestOBJ.request_name)+"&"+"request_type="+encodeURIComponent(ListRequestOBJ.request_type);
-        targetURL = "http://127.0.0.1:42055/api/v1/user_client/get"+params;
-        console.log(targetURL)
-        a = await fetch_GetList(targetURL);
+        let params = "?request_name="+encodeURIComponent(ListRequestOBJ.request_name)+"&"+"request_type="+encodeURIComponent(ListRequestOBJ.request_type);
+        let targetURL = "http://127.0.0.1:42055/api/v1/user_client/get"+params;
+        //console.log(targetURL)
+        let a = await fetch_GetList(targetURL);
         //console.log("return: "+a);
         return a
     }
@@ -59,7 +59,12 @@ async function GetListCommands() {
     return notDictionary
 }
 
-let returnedCommands = GetListCommands();
+function updateCommandList() {
+    let returnedCommands = GetListCommands();
+}
+
+updateCommandList();
+
 
 
 async function GetListRewards() {