diff --git a/dashboard.py b/dashboard.py
index 5574203..5d7e0d0 100644
--- a/dashboard.py
+++ b/dashboard.py
@@ -27,7 +27,7 @@ def generate_sample(ctx, e):
     if ctx.count % 50 == 0:
         emit('debug', {'text': 'Log message #'+str(ctx.count)+'!'})
     tweet = e.data
-    print(tweet)
+    # print(tweet)
     # base sample on previous one
     # sample = clip(-100, e.data['previous'] + random.uniform(+5.0, -5.0), 100)
     # emit to outside world
diff --git a/dashboard_static/index.html b/dashboard_static/index.html
index 68a75a8..f9b2b58 100644
--- a/dashboard_static/index.html
+++ b/dashboard_static/index.html
@@ -57,32 +57,18 @@
             </div>
         </div>
         <div class="main">
-            <!--
-            <div class="leftcol">
-                <div class="tweet"> 
-                    <img src="https://pbs.twimg.com/profile_images/1158803404656959490/9MKSbW4O_400x400.jpg" alt="" class="tweet-profilepicture">
-                    <div class="tweet-content">
-                        <div class="tweet-name">
-                            <span class="tweet-nickname">Tim Wijma</span>
-                            <span class="tweet-username">@timwijma</span>
-                        </div>
-                        <span class="tweet-text">Lorem ipsum dolor sit amet consectetur adipisicing elit. Possimus velit maiores non deserunt adipisci dicta quam nobis ad. Iste, unde?</span>
-                        <div class="tweet-interactions">
-                            <div class="tweet-interaction tweet-likes">
-                                <span class="material-symbols-outlined">favorite</span>
-                                <span>20</span>
-                            </div>
-                            <div class="tweet-interaction tweet-retweets">
-                                <span class="material-symbols-outlined">repeat</span>
-                                <span>20</span>
-                            </div>
-                            <div class="tweet-interaction tweet-replies">
-                                <span class="material-symbols-outlined">chat_bubble</span>
-                                <span>20</span>
-                            </div>
-                        </div>
-                    </div>
+            <div class="maintable">
+                <div class="leftcol column">
+                    <h1 class="colheader">LATEST CLUCCS</h1>
                 </div>
+                <div class="centercol column">
+                    <h1 class="colheader">FILTERED CLUCCS</h1>
+                </div>
+                <div class="searchbar column"></div>
+                <div class="popchart column">
+                    <h1 class="colheader chartheader">SPORTS POPULARITY CHART</h1>
+                </div>
+<<<<<<< HEAD
             </div>
             -->
             <div class = "maintable">
@@ -96,6 +82,8 @@
                 <div class = "popchart">
                     <h1 class = 'colheader'>SPORTS POPULARITY CHART</h1>
                 </div>
+=======
+>>>>>>> 552191335378d5d4fcc19eee637d115ec515d385
             </div>
         </div> 
     </div>
diff --git a/dashboard_static/style/style.css b/dashboard_static/style/style.css
index 16d5e83..1789f5f 100644
--- a/dashboard_static/style/style.css
+++ b/dashboard_static/style/style.css
@@ -23,10 +23,7 @@ body {
 .container {
 	background-color: var(--main-bg);
 	color: white;
-	display: block;
-	margin-left: auto;
-	margin-right: auto;
-	padding: 16px 32px;
+	padding: 16px 48px;
 }
 
 .header, .sports, .logo {
@@ -106,8 +103,24 @@ body {
 	align-items: center;
 }
 
-/* Three main columns; CSS Grid */
+.filters-search input {
+	height: 28px;
+	width: 100%;
+	border: none;
+	font-family: 'Robot', sans-serif;
+	font-size: 24px;
+	padding: 0;
+	padding-right: 32px;
+}
 
+.filters-search span {
+	position: absolute;
+	font-weight: 500;
+	font-size: 24px;
+	color: var(--main-medium-dark);
+}
+
+/* Three main columns; CSS Grid */
 .maintable {
 	/*background-color: #ffffff; */ /* The colors are there just so that I can see what I'm doing better */
 	display: grid;
@@ -115,37 +128,36 @@ body {
 	grid-template-columns: 1fr 1fr 1fr;
 	grid-template-rows: 1fr 1fr;
 
-	gap: 20px;
-	margin:20px;
+	gap: 48px;
+	/* margin:20px; */
+}
+
+.main {
+	margin-top: 48px;
+}
+
+.column {
+	border-radius: 16px;
 }
 
 .leftcol {
 	background-color: red;
-	border-radius: 16px;
 	grid-row: 1/ -1;
-
-	margin: 40px;
 }
 
 .centercol {
 	background-color: green;
-	border-radius: 16px;
 	grid-row: 1/ -1;
-	margin: 40px;
 }
 
 .searchbar {
 	background-color: blue;
-	border-radius: 16px;
 	height: 400px;
-	margin: 40px;
 }
 
 .popchart {
 	background-color: rgba(255, 0, 255, 0.344);
-	border-radius: 16px;
 	height: 400px;
-	margin: 40px;
 }
 
 .colheader {