diff --git a/src/notebook.cc b/src/notebook.cc
index 40b9874..8c9b4e3 100644
--- a/src/notebook.cc
+++ b/src/notebook.cc
@@ -86,11 +86,11 @@ void Notebook::open(const boost::filesystem::path &file_path) {
   
   source_views.back()->on_update_status=[this](Source::View* view, const std::string &status) {
     if(get_current_page()!=-1 && get_current_view()==view)
-      Singleton::status()->set_text(status+" ");
+      Singleton::status()->set_text(status);
   };
   source_views.back()->on_update_info=[this](Source::View* view, const std::string &info) {
     if(get_current_page()!=-1 && get_current_view()==view)
-      Singleton::info()->set_text(" "+info);
+      Singleton::info()->set_text(info);
   };
     
   scrolled_windows.emplace_back(new Gtk::ScrolledWindow());
diff --git a/src/window.cc b/src/window.cc
index 13bfa5a..b4c30d2 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -44,18 +44,20 @@ Window::Window() : box(Gtk::ORIENTATION_VERTICAL), notebook(directories), compil
 
   directory_and_notebook_panes.pack1(directories, Gtk::SHRINK);
   notebook_vbox.pack_start(notebook);
-  notebook_vbox.pack_end(entry_box, Gtk::PACK_SHRINK);
+
+  entry_and_info_status_vbox.pack_start(entry_box, Gtk::PACK_SHRINK);
+  info_and_status_hbox.pack_start(*Singleton::info(), Gtk::PACK_SHRINK);
+  info_and_status_hbox.pack_end(*Singleton::status(), Gtk::PACK_SHRINK);
+  entry_and_info_status_vbox.pack_end(info_and_status_hbox, Gtk::PACK_SHRINK);
+  notebook_vbox.pack_end(entry_and_info_status_vbox, Gtk::PACK_SHRINK);
   directory_and_notebook_panes.pack2(notebook_vbox, Gtk::SHRINK);
+  
   directory_and_notebook_panes.set_position(120);
   vpaned.set_position(300);
   vpaned.pack1(directory_and_notebook_panes, true, false);
   
   terminal_scrolled_window.add(*Singleton::terminal());
-  terminal_vbox.pack_start(terminal_scrolled_window);
-  info_and_status_hbox.pack_start(*Singleton::info(), Gtk::PACK_SHRINK);
-  info_and_status_hbox.pack_end(*Singleton::status(), Gtk::PACK_SHRINK);
-  terminal_vbox.pack_end(info_and_status_hbox, Gtk::PACK_SHRINK);
-  vpaned.pack2(terminal_vbox, true, true);
+  vpaned.pack2(terminal_scrolled_window, true, true);
   
   box.pack_end(vpaned);
   show_all_children();
diff --git a/src/window.h b/src/window.h
index 5c8b349..2c66e62 100644
--- a/src/window.h
+++ b/src/window.h
@@ -31,7 +31,7 @@ private:
   Gtk::VPaned vpaned;
   Gtk::Paned directory_and_notebook_panes;
   Gtk::VBox notebook_vbox;
-  Gtk::VBox terminal_vbox;
+  Gtk::VBox entry_and_info_status_vbox;
   Gtk::ScrolledWindow terminal_scrolled_window;
   Gtk::HBox info_and_status_hbox;
   Gtk::AboutDialog about;