diff --git a/res/main_window.glade b/res/main_window.glade
index 866bec48..ff231ea0 100644
--- a/res/main_window.glade
+++ b/res/main_window.glade
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.20.0 -->
 <interface>
-  <requires lib="gtk+" version="3.12"/>
+  <requires lib="gtk+" version="3.20"/>
   <object class="GtkListStore" id="members_store">
     <columns>
       <!-- column-name alias -->
@@ -22,403 +22,369 @@
     <property name="can_focus">False</property>
     <property name="show_menubar">False</property>
     <child>
-      <object class="GtkPaned">
+      <object class="GtkStack" id="main_content_stack">
         <property name="can_focus">False</property>
-        <property name="position_set">True</property>
-        <property name="wide_handle">True</property>
         <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="width_request">200</property>
-            <property name="visible">True</property>
+          <object class="GtkGrid" id="focused_room">
+            <property name="name">room</property>
             <property name="can_focus">False</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="min_content_width">200</property>
-            <property name="propagate_natural_width">True</property>
             <child>
-              <object class="GtkTreeView" id="rooms_tree_view">
-                <property name="width_request">200</property>
+              <object class="GtkBox" id="room_header">
                 <property name="can_focus">False</property>
-                <property name="margin_right">1</property>
-                <property name="model">rooms_tree_store</property>
-                <property name="headers_visible">False</property>
-                <property name="search_column">0</property>
-                <property name="enable_grid_lines">both</property>
-                <child internal-child="selection">
-                  <object class="GtkTreeSelection"/>
-                </child>
+                <property name="margin_left">8</property>
+                <property name="margin_right">8</property>
+                <property name="hexpand">True</property>
+                <property name="border_width">4</property>
+                <property name="spacing">8</property>
                 <child>
-                  <object class="GtkTreeViewColumn">
-                    <child>
-                      <object class="GtkCellRendererText">
-                        <property name="ellipsize">end</property>
-                      </object>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
+                  <object class="GtkImage" id="room_image">
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-missing-image</property>
+                    <property name="pixel_size">48</property>
+                    <property name="icon_size">6</property>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="resize">True</property>
-            <property name="shrink">False</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkStack" id="main_content_stack">
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkGrid" id="focused_room">
-                <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkBox" id="room_header">
+                  <object class="GtkBox">
                     <property name="can_focus">False</property>
-                    <property name="margin_left">8</property>
-                    <property name="margin_right">8</property>
-                    <property name="hexpand">True</property>
-                    <property name="border_width">4</property>
-                    <property name="spacing">8</property>
+                    <property name="margin_top">4</property>
+                    <property name="margin_bottom">4</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">4</property>
                     <child>
-                      <object class="GtkImage" id="room_image">
+                      <object class="GtkLabel" id="room_name">
                         <property name="can_focus">False</property>
-                        <property name="pixel_size">48</property>
-                        <property name="icon_name">face-smile</property>
+                        <property name="halign">start</property>
+                        <property name="label" translatable="yes">&lt;Room name&gt;</property>
+                        <property name="ellipsize">end</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
+                        <property name="fill">False</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkBox">
+                      <object class="GtkLabel" id="room_topic">
                         <property name="can_focus">False</property>
-                        <property name="margin_top">4</property>
-                        <property name="margin_bottom">4</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">4</property>
-                        <child>
-                          <object class="GtkLabel" id="room_name">
-                            <property name="can_focus">False</property>
-                            <property name="halign">start</property>
-                            <property name="label" translatable="yes">&lt;Room name&gt;</property>
-                            <property name="ellipsize">end</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="room_topic">
-                            <property name="can_focus">False</property>
-                            <property name="halign">start</property>
-                            <property name="label" translatable="yes">&lt;Description&gt;</property>
-                            <property name="ellipsize">end</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton">
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="valign">center</property>
-                        <property name="relief">none</property>
-                        <child>
-                          <object class="GtkImage">
-                            <property name="can_focus">False</property>
-                            <property name="icon_name">edit-find</property>
-                          </object>
-                        </child>
+                        <property name="halign">start</property>
+                        <property name="label" translatable="yes">&lt;Description&gt;</property>
+                        <property name="ellipsize">end</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="pack_type">end</property>
-                        <property name="position">2</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton">
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="valign">center</property>
+                    <property name="relief">none</property>
                     <child>
-                      <object class="GtkButton">
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="valign">center</property>
-                        <property name="relief">none</property>
-                        <child>
-                          <object class="GtkImage">
-                            <property name="can_focus">False</property>
-                            <property name="icon_name">preferences-system</property>
-                          </object>
-                        </child>
+                      <object class="GtkImage">
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">edit-find</property>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="pack_type">end</property>
-                        <property name="position">3</property>
-                      </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="pack_type">end</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkStackSwitcher" id="room_sidebar_stack_switcher">
-                    <property name="can_focus">False</property>
-                    <property name="halign">center</property>
+                  <object class="GtkButton">
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
                     <property name="valign">center</property>
-                    <property name="border_width">5</property>
-                    <property name="stack">room_sidebar_stack</property>
+                    <property name="relief">none</property>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">preferences-system</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
-                    <property name="left_attach">2</property>
-                    <property name="top_attach">0</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="pack_type">end</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkStack" id="room_sidebar_stack">
+                <property name="width_request">200</property>
+                <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkStack" id="room_sidebar_stack">
-                    <property name="width_request">200</property>
-                    <property name="can_focus">False</property>
+                  <object class="GtkScrolledWindow" id="member_scroll">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkScrolledWindow" id="member_scroll">
+                      <object class="GtkViewport">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="shadow_type">in</property>
+                        <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkViewport">
+                          <object class="GtkTreeView" id="members_treeview">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="model">members_store</property>
+                            <property name="headers_visible">False</property>
+                            <property name="enable_grid_lines">vertical</property>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection"/>
+                            </child>
                             <child>
-                              <object class="GtkTreeView" id="members_treeview">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="model">members_store</property>
-                                <property name="headers_visible">False</property>
-                                <property name="enable_grid_lines">vertical</property>
-                                <child internal-child="selection">
-                                  <object class="GtkTreeSelection"/>
-                                </child>
+                              <object class="GtkTreeViewColumn">
+                                <property name="title" translatable="yes">name</property>
                                 <child>
-                                  <object class="GtkTreeViewColumn">
-                                    <property name="title" translatable="yes">name</property>
-                                    <child>
-                                      <object class="GtkCellRendererText">
-                                        <property name="ellipsize">end</property>
-                                      </object>
-                                      <attributes>
-                                        <attribute name="text">0</attribute>
-                                      </attributes>
-                                    </child>
+                                  <object class="GtkCellRendererText">
+                                    <property name="ellipsize">end</property>
                                   </object>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
                                 </child>
                               </object>
                             </child>
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="name">room_member_list</property>
-                        <property name="title" translatable="yes">Members</property>
-                        <property name="icon_name">contact-new</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">&lt;Files&gt;</property>
-                      </object>
-                      <packing>
-                        <property name="name">room_file_list</property>
-                        <property name="title" translatable="yes">Files</property>
-                        <property name="icon_name">mail-attachment</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">&lt;Notifications&gt;</property>
-                      </object>
-                      <packing>
-                        <property name="name">room_notification_list</property>
-                        <property name="title" translatable="yes">Notifications</property>
-                        <property name="icon_name">preferences-system-notifications</property>
-                        <property name="position">2</property>
-                      </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="left_attach">2</property>
-                    <property name="top_attach">2</property>
-                    <property name="height">2</property>
+                    <property name="name">room_member_list</property>
+                    <property name="title" translatable="yes">Members</property>
+                    <property name="icon_name">contact-new</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkLabel">
                     <property name="can_focus">False</property>
-                    <property name="border_width">4</property>
-                    <property name="spacing">4</property>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="can_focus">False</property>
-                        <property name="pixel_size">32</property>
-                        <property name="icon_name">face-glasses</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry">
-                        <property name="can_focus">True</property>
-                        <property name="valign">center</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkToolbar">
-                        <property name="can_focus">False</property>
-                        <property name="toolbar_style">icons</property>
-                        <child>
-                          <object class="GtkToolButton">
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Upload file</property>
-                            <property name="icon_name">mail-attachment</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">True</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton">
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Voice call</property>
-                            <property name="icon_name">audio-input-microphone</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">True</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton">
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Audio call</property>
-                            <property name="icon_name">camera-video</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="homogeneous">True</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
+                    <property name="label" translatable="yes">&lt;Files&gt;</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
+                    <property name="name">room_file_list</property>
+                    <property name="title" translatable="yes">Files</property>
+                    <property name="icon_name">mail-attachment</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkSeparator">
+                  <object class="GtkLabel">
                     <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;Notifications&gt;</property>
+                  </object>
+                  <packing>
+                    <property name="name">room_notification_list</property>
+                    <property name="title" translatable="yes">Notifications</property>
+                    <property name="icon_name">preferences-system-notifications</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="top_attach">1</property>
+                <property name="height">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="can_focus">False</property>
+                <property name="border_width">4</property>
+                <property name="spacing">4</property>
+                <child>
+                  <object class="GtkEntry" id="msg_entry">
+                    <property name="can_focus">True</property>
+                    <property name="valign">center</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                    <property name="width">3</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkSeparator">
+                  <object class="GtkToolbar">
                     <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
+                    <property name="toolbar_style">icons</property>
+                    <child>
+                      <object class="GtkToolButton" id="send_button">
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Send</property>
+                        <property name="stock_id">gtk-ok</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="homogeneous">True</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                    <property name="height">4</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="messages_scroll">
+                <property name="width_request">300</property>
+                <property name="height_request">300</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="shadow_type">in</property>
                 <child>
-                  <object class="GtkScrolledWindow" id="messages_scroll">
-                    <property name="width_request">300</property>
-                    <property name="height_request">300</property>
+                  <object class="GtkViewport">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">never</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkViewport">
+                      <object class="GtkListBox" id="message_list">
+                        <property name="width_request">300</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="vexpand">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow">
+                <property name="width_request">200</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="shadow_type">in</property>
+                <child>
+                  <object class="GtkViewport">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkTreeView" id="rooms_tree_view">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="model">rooms_tree_store</property>
+                        <property name="headers_visible">False</property>
+                        <property name="activate_on_single_click">True</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection"/>
+                        </child>
                         <child>
-                          <object class="GtkListBox" id="message_list">
-                            <property name="width_request">300</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="vexpand">True</property>
+                          <object class="GtkTreeViewColumn">
+                            <property name="min_width">200</property>
+                            <property name="max_width">200</property>
+                            <child>
+                              <object class="GtkCellRendererText">
+                                <property name="ellipsize">end</property>
+                              </object>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
                           </object>
                         </child>
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="name">room_page</property>
-                <property name="title" translatable="yes">Chat</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="height">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkListBox" id="directory_room_list">
+              <object class="GtkBox">
+                <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkSeparator">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkStackSwitcher" id="room_sidebar_stack_switcher">
+                    <property name="can_focus">False</property>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="border_width">5</property>
+                    <property name="stack">room_sidebar_stack</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
-                <property name="name">directory_page</property>
-                <property name="title" translatable="yes">Directory</property>
-                <property name="position">1</property>
+                <property name="left_attach">3</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="resize">True</property>
-            <property name="shrink">False</property>
+            <property name="name">room_page</property>
+            <property name="title" translatable="yes">Chat</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkListBox" id="directory_room_list">
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="name">directory_page</property>
+            <property name="title" translatable="yes">Directory</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
@@ -509,6 +475,9 @@
             <property name="valign">center</property>
             <property name="stack">main_content_stack</property>
           </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
         </child>
       </object>
     </child>
@@ -553,6 +522,7 @@
                   <object class="GtkEntry" id="login_username">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="secondary_icon_name">face-plain</property>
                     <property name="placeholder_text" translatable="yes">User name</property>
                   </object>
                   <packing>