diff --git a/src/style.css b/src/style.css
index 0ac3bd3..a889315 100644
--- a/src/style.css
+++ b/src/style.css
@@ -1,6 +1,5 @@
 .message-input {
-  background-color: #EBEBEB;
-  border-radius: 10px;
+  background-color: rgba(0,0,0,0);
 }
 
 .message-text-view {
diff --git a/src/window.py b/src/window.py
index f4bebe0..5a444c0 100644
--- a/src/window.py
+++ b/src/window.py
@@ -130,7 +130,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
         else:
             self.image_button.set_sensitive(False)
             self.image_button.set_tooltip_text(_("Only available on selected models"))
-            self.image_button.set_css_classes([])
+            self.image_button.set_css_classes(["circular"])
             self.image_button.get_child().set_icon_name("image-x-generic-symbolic")
             self.attached_image = {"path": None, "base64": None}
             return False
@@ -140,7 +140,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
         if button and self.bot_message: #STOP BUTTON
             if self.loading_spinner: self.chat_container.remove(self.loading_spinner)
             if self.verify_if_image_can_be_used(): self.image_button.set_sensitive(True)
-            self.image_button.set_css_classes([])
+            self.image_button.set_css_classes(["circular"])
             self.image_button.get_child().set_icon_name("image-x-generic-symbolic")
             self.attached_image = {"path": None, "base64": None}
             self.toggle_ui_sensitive(True)
@@ -429,7 +429,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
 
                 footer = None
                 if part['text'].split("\n")[-1] == parts[-1]['text'].split("\n")[-1]:
-                    footer = "\n\n<small>" + part['text'].split('\n')[-1] + "</small>"
+                    footer = "\n<small>" + part['text'].split('\n')[-1] + "</small>"
                     part['text'] = '\n'.join(part['text'].split("\n")[:-1])
 
                 part['text'] = part['text'].replace("\n* ", "\n• ")
@@ -538,7 +538,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
         GLib.idle_add(self.send_button.get_child().set_icon_name, "send-to-symbolic")
         GLib.idle_add(self.toggle_ui_sensitive, True)
         if self.verify_if_image_can_be_used(): GLib.idle_add(self.image_button.set_sensitive, True)
-        GLib.idle_add(self.image_button.set_css_classes, [])
+        GLib.idle_add(self.image_button.set_css_classes, ["circular"])
         GLib.idle_add(self.image_button.get_child().set_icon_name, "image-x-generic-symbolic")
         self.attached_image = {"path": None, "base64": None}
         if response['status'] == 'error':
@@ -677,13 +677,13 @@ class AlpacaWindow(Adw.ApplicationWindow):
                     image_data = output.getvalue()
                 self.attached_image["base64"] = base64.b64encode(image_data).decode("utf-8")
 
-            self.image_button.set_css_classes(["destructive-action"])
+            self.image_button.set_css_classes(["destructive-action", "circular"])
             self.image_button.get_child().set_icon_name("edit-delete-symbolic")
         except Exception as e:
             self.show_toast("error", 5, self.main_overlay)
 
     def remove_image(self):
-        self.image_button.set_css_classes([])
+        self.image_button.set_css_classes(["circular"])
         self.image_button.get_child().set_icon_name("image-x-generic-symbolic")
         self.attached_image = {"path": None, "base64": None}
 
@@ -705,7 +705,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
         self.save_history()
         self.update_chat_list()
         if len(self.chats['chats'])==0:
-            self.chat_new()
+            self.new_chat()
 
     def rename_chat(self, old_chat_name, new_chat_name, label_element):
         new_chat_name = self.generate_numbered_chat_name(new_chat_name)
diff --git a/src/window.ui b/src/window.ui
index 9b88a1b..7619a78 100644
--- a/src/window.ui
+++ b/src/window.ui
@@ -180,62 +180,62 @@
                           <property name="margin-bottom">12</property>
                           <property name="margin-start">12</property>
                           <property name="margin-end">12</property>
+                          <child>
+                            <object class="GtkButton" id="image_button">
+                              <signal name="clicked" handler="open_image"/>
+                              <property name="vexpand">false</property>
+                              <property name="valign">3</property>
+                              <property name="sensitive">false</property>
+                              <property name="tooltip-text" translatable="yes">Only available on selected models</property>
+                              <child>
+                                <object class="AdwButtonContent">
+                                  <property name="icon-name">image-x-generic-symbolic</property>
+                                </object>
+                              </child>
+                            </object>
+                          </child>
                           <child>
                             <object class="GtkBox">
                               <style>
+                                <class name="card"/>
                                 <class name="message-input"/>
                               </style>
                               <child>
                                 <object class="GtkScrolledWindow">
                                   <property name="margin-start">12</property>
                                   <property name="margin-end">12</property>
-
+                                  <style>
+                                    <class name="message-input"/>
+                                    <class name="undershoot-bottom"/>
+                                    <class name="undershoot-top"/>
+                                  </style>
                                   <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"/>
+                                        <class name="message-input"/>
                                       </style>
                                     </object>
                                   </child>
                                 </object>
                               </child>
                             </object>
-
                             </child>
                             <child>
-                              <object class="GtkBox">
-                                <property name="orientation">1</property>
-                                <property name="spacing">12</property>
+                              <object class="GtkButton" id="send_button">
+                                <signal name="clicked" handler="send_message"/>
+                                <property name="vexpand">false</property>
+                                <property name="valign">3</property>
+                                <style>
+                                  <class name="suggested-action"/>
+                                  <class name="circular"/>
+                                </style>
                                 <child>
-                                  <object class="GtkButton" id="send_button">
-                                    <signal name="clicked" handler="send_message"/>
-                                    <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">
-                                    <signal name="clicked" handler="open_image"/>
-                                    <property name="sensitive">false</property>
-                                    <property name="tooltip-text" translatable="yes">Only available on selected models</property>
-                                    <child>
-                                      <object class="AdwButtonContent">
-                                        <property name="label" translatable="yes">Image</property>
-                                        <property name="icon-name">image-x-generic-symbolic</property>
-                                      </object>
-                                    </child>
+                                  <object class="AdwButtonContent">
+                                    <property name="icon-name">send-to-symbolic</property>
                                   </object>
                                 </child>
                               </object>
@@ -647,3 +647,4 @@
   </object>
 </interface>
 
+