diff --git a/src/alpaca.gresource.xml b/src/alpaca.gresource.xml
index f36f8e8..d1957f5 100644
--- a/src/alpaca.gresource.xml
+++ b/src/alpaca.gresource.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/com/jeffser/Alpaca">
+    <file>style.css</file>
+    <file>style-dark.css</file>
     <file preprocess="xml-stripblanks">window.ui</file>
     <file preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
   </gresource>
diff --git a/src/style-dark.css b/src/style-dark.css
new file mode 100644
index 0000000..496408f
--- /dev/null
+++ b/src/style-dark.css
@@ -0,0 +1,7 @@
+.message-input {
+  background-color: #343434;
+}
+
+.message-text-view {
+  background-color: #343434;
+}
diff --git a/src/style.css b/src/style.css
new file mode 100644
index 0000000..00f18f2
--- /dev/null
+++ b/src/style.css
@@ -0,0 +1,8 @@
+.message-input {
+  background-color: #EBEBEB;
+  border-radius: 10px;
+}
+
+.message-text-view {
+  background-color: #EBEBEB;
+}
diff --git a/src/window.py b/src/window.py
index 9d23c69..87864a2 100644
--- a/src/window.py
+++ b/src/window.py
@@ -381,7 +381,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
         GLib.idle_add(self.image_button.set_css_classes, [])
         GLib.idle_add(self.image_button.get_child().set_icon_name, "image-x-generic-symbolic")
         self.attached_image = {"path": None, "base64": None}
-        GLib.idle_add(self.message_text_view.set_sensitive, True)
+        # GLib.idle_add(self.message_text_view.set_sensitive, True)
         if response['status'] == 'error':
             GLib.idle_add(self.show_toast, 'error', 1, self.connection_overlay)
             GLib.idle_add(self.connection_error)
@@ -397,7 +397,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
             self.add_chat_button.set_sensitive(True)
             self.export_chat_button.set_sensitive(True)
             self.import_chat_button.set_sensitive(True)
-            self.message_text_view.set_sensitive(True)
+            # self.message_text_view.set_sensitive(True)
             self.send_button.set_css_classes(["suggested-action"])
             self.send_button.get_child().set_label("Send")
             self.send_button.get_child().set_icon_name("send-to-symbolic")
@@ -423,7 +423,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
             }
             if self.verify_if_image_can_be_used() and self.attached_image["base64"] is not None:
                 data["messages"][-1]["images"] = [self.attached_image["base64"]]
-            self.message_text_view.set_sensitive(False)
+            # self.message_text_view.set_sensitive(False)
             self.send_button.set_css_classes(["destructive-action"])
             self.send_button.get_child().set_label("Stop")
             self.send_button.get_child().set_icon_name("edit-delete-symbolic")
diff --git a/src/window.ui b/src/window.ui
index c374725..6f26438 100644
--- a/src/window.ui
+++ b/src/window.ui
@@ -158,86 +158,104 @@
                 <property name="content">
                   <object class="GtkBox"><!--ACTUAL CONTENT-->
                     <property name="orientation">1</property>
-                    <property name="margin-start">24</property>
-                    <property name="margin-end">24</property>
-                    <property name="margin-bottom">24</property>
                     <property name="vexpand">true</property>
                     <property name="hexpand">true</property>
-
                     <child>
                       <object class="GtkScrolledWindow" id="chat_window">
-                        <property name="margin-bottom">12</property>
                         <property name="propagate-natural-height">true</property>
                         <property name="kinetic-scrolling">true</property>
                         <property name="vexpand">true</property>
+                        <style>
+                          <class name="undershoot-bottom"/>
+                        </style>
                         <child>
-                          <object class="GtkBox" id="chat_container">
-                            <property name="orientation">1</property>
-                            <property name="homogeneous">false</property>
-                            <property name="hexpand">true</property>
-                            <property name="vexpand">true</property>
-                            <property name="spacing">12</property>
-                            <property name="margin-top">12</property>
-                            <property name="margin-bottom">12</property>
-                            <property name="margin-start">12</property>
-                            <property name="margin-end">12</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-
-                    <child>
-                      <object class="GtkBox">
-                        <property name="orientation">0</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkScrolledWindow">
-                            <property name="has-frame">true</property>
-                            <style>
-                              <class name="card"/>
-                              <class name="view"/>
-                            </style>
+                          <object class="AdwClamp">
+                            <property name="maximum-size">1000</property>
+                            <property name="tightening-threshold">800</property>
                             <child>
-                              <object class="GtkTextView" id="message_text_view">
-                                <property name="wrap-mode">word</property>
+                              <object class="GtkBox" id="chat_container">
+                                <property name="orientation">1</property>
+                                <property name="homogeneous">false</property>
+                                <property name="hexpand">true</property>
+                                <property name="vexpand">true</property>
+                                <property name="spacing">12</property>
                                 <property name="margin-top">12</property>
                                 <property name="margin-bottom">12</property>
                                 <property name="margin-start">12</property>
                                 <property name="margin-end">12</property>
-                                <property name="hexpand">true</property>
-                                <style>
-                                  <class name="view"/>
-                                </style>
                               </object>
                             </child>
                           </object>
-
                         </child>
-                        <child>
-                          <object class="GtkBox">
-                            <property name="orientation">1</property>
-                            <property name="spacing">12</property>
-                            <child>
-                              <object class="GtkButton" id="send_button">
-                                <style>
-                                  <class name="suggested-action"/>
-                                </style>
-                                <child>
-                                  <object class="AdwButtonContent">
-                                    <property name="label" translatable="yes">Send</property>
-                                    <property name="icon-name">send-to-symbolic</property>
-                                  </object>
-                                </child>
-                              </object>
+                      </object>
+                    </child>
+
+                    <child>
+                      <object class="AdwClamp">
+                        <property name="maximum-size">1000</property>
+                        <property name="tightening-threshold">800</property>
+                      <child>
+                        <object class="GtkBox">
+                          <property name="orientation">0</property>
+                          <property name="spacing">12</property>
+                          <property name="margin-top">12</property>
+                          <property name="margin-bottom">12</property>
+                          <property name="margin-start">12</property>
+                          <property name="margin-end">12</property>
+                          <child>
+                            <object class="GtkBox">
+                              <style>
+                                <class name="message-input"/>
+                              </style>
+                              <child>
+                                <object class="GtkScrolledWindow">
+                                  <property name="margin-start">12</property>
+                                  <property name="margin-end">12</property>
+
+                                  <child>
+                                    <object class="GtkTextView" id="message_text_view">
+                                      <property name="wrap-mode">word</property>
+                                      <property name="top-margin">6</property>
+                                      <property name="bottom-margin">6</property>
+                                      <property name="margin-end">12</property>
+                                      <property name="hexpand">true</property>
+                                      <style>
+                                        <class name="message-text-view"/>
+                                      </style>
+                                    </object>
+                                  </child>
+                                </object>
+                              </child>
+                            </object>
+
                             </child>
                             <child>
-                              <object class="GtkButton" id="image_button">
-                                <property name="sensitive">false</property>
-                                <property name="tooltip-text" translatable="yes">Requires model 'llava' to be selected</property>
+                              <object class="GtkBox">
+                                <property name="orientation">1</property>
+                                <property name="spacing">12</property>
                                 <child>
-                                  <object class="AdwButtonContent">
-                                    <property name="label" translatable="yes">Image</property>
-                                    <property name="icon-name">image-x-generic-symbolic</property>
+                                  <object class="GtkButton" id="send_button">
+                                    <style>
+                                      <class name="suggested-action"/>
+                                    </style>
+                                    <child>
+                                      <object class="AdwButtonContent">
+                                        <property name="label" translatable="yes">Send</property>
+                                        <property name="icon-name">send-to-symbolic</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="image_button">
+                                    <property name="sensitive">false</property>
+                                    <property name="tooltip-text" translatable="yes">Requires model 'llava' to be selected</property>
+                                    <child>
+                                      <object class="AdwButtonContent">
+                                        <property name="label" translatable="yes">Image</property>
+                                        <property name="icon-name">image-x-generic-symbolic</property>
+                                      </object>
+                                    </child>
                                   </object>
                                 </child>
                               </object>
@@ -247,6 +265,7 @@
                       </object>
                     </child>
 
+
                   </object><!--END OF CONTENT-->
                 </property>
               </object>