diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 215fa4b..6630d70 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1,158 +1,173 @@
 /* Atelier KDE Printer Host for 3D Printing
     Copyright (C) <2016>
     Author: Lays Rodrigues - laysrodrigues@gmail.com
             Chris Rizzitello - rizzitello@kde.org
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include <QFileDialog>
 #include <KLocalizedString>
 #include <KStandardAction>
 #include <KActionCollection>
 #include <KXMLGUIFactory>
+#include <set>
+#include <QToolButton>
+
 #include "widgets/gcodeeditorwidget.h"
+#include <QStackedWidget>
+#include "widgets/3dview/viewer3d.h"
+#include "widgets/videomonitorwidget.h"
 
 MainWindow::MainWindow(QWidget *parent) :
     KXmlGuiWindow(parent),
     ui(new Ui::MainWindow),
-    leftToolbar(new QToolBar()),
     profilesDialog(new ProfilesDialog(this)),
     connectSettingsDialog(new ConnectSettingsDialog(this)),
     m_curr_editor_view(nullptr)
 {
     ui->setupUi(this);
     setupActions();
     initWidgets();
-// Use this if trying to fix the bug with the connection
-//     m_curr_editor_view = ui->gcodeEditorWidget->gcodeView();
 }
 
 MainWindow::~MainWindow()
 {
     delete ui;
 }
 
 
 void MainWindow::initWidgets()
 {
     // When a new profile is added on the Profile Dialog it needs to update the profiles on connection dialog
     connect(profilesDialog, &ProfilesDialog::updateProfiles,
             connectSettingsDialog, &ConnectSettingsDialog::updateProfiles);
     connect(connectSettingsDialog, &ConnectSettingsDialog::startConnection, this, &MainWindow::newConnection);
-    connect(ui->gcodeEditorWidget, &GCodeEditorWidget::updateClientFactory, this, [=](KTextEditor::View* view){
-        guiFactory()->removeClient(m_curr_editor_view);
-        guiFactory()->addClient(view);
-        m_curr_editor_view = view;
-    });
-    tabifyDockWidget(ui->view3DdockWidget, ui->gcodeDockWidget);
-    tabifyDockWidget(ui->gcodeDockWidget, ui->videoDockWidget);
-    ui->gcodeDockWidget->setHidden(true);
-    ui->videoDockWidget->setHidden(true);
-    buildToolbar();
+
+    /*
     auto instance = qobject_cast<AtCoreInstanceWidget*>(ui->tabWidget->currentWidget());
     connectSettingsDialog->setFirmwareList(instance->firmwares());
     profilesDialog->setBaudRates(instance->baudRates());
+    */
+
+    setupLateralArea();
 }
 
-void MainWindow::buildToolbar()
+// Move to LateralArea.
+void MainWindow::setupLateralArea()
 {
-    leftToolbar->setObjectName("left_toolbar");
-    leftToolbar->setOrientation(Qt::Vertical);
-    leftToolbar->setMovable(true);
-    leftToolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    addToolBar(Qt::LeftToolBarArea, leftToolbar);
+    m_lateral.m_toolBar = new QWidget();
+    m_lateral.m_stack = new QStackedWidget();
+    auto *buttonLayout = new QVBoxLayout();
+
+    auto setupButton = [this, buttonLayout](const QString& s, QWidget *w) {
+        QToolButton *btn = nullptr;
+        btn = new QToolButton(m_lateral.m_toolBar);
+        btn->setText(s);
+        btn->setAutoExclusive(true);
+        btn->setCheckable(true);
+        m_lateral.m_stack->addWidget(w);
+        m_lateral.m_map[s] = {btn, w};
+
+        buttonLayout->addWidget(btn);
+        connect(btn, &QToolButton::toggled, [this, w](bool checked) {
+            if (checked)
+                m_lateral.m_stack->setCurrentWidget(w);
+        });
+    };
+
+    auto *gcodeEditor = new GCodeEditorWidget(this);
+     connect(gcodeEditor, &GCodeEditorWidget::updateClientFactory, this, [=](KTextEditor::View* view){
+         guiFactory()->removeClient(m_curr_editor_view);
+         guiFactory()->addClient(view);
+         m_curr_editor_view = view;
+     });
+
+    setupButton(i18n("&3D"), new Viewer3D(this));
+    setupButton(i18n("&GCode"), gcodeEditor);
+    setupButton(i18n("&Video"), new VideoMonitorWidget(this));
+
+    m_lateral.m_toolBar->setLayout(buttonLayout);
+    m_lateral.m_toolBar->show();
+    m_lateral.m_stack->show();
+
+
 }
 
 void MainWindow::setupActions()
 {
     // Actions for the Toolbar
     QAction *action;
     action = actionCollection()->addAction(QStringLiteral("open_gcode"));
     action->setText(i18n("&Open GCode"));
     connect(action, &QAction::triggered, this, &MainWindow::openFile);
 
     action = actionCollection()->addAction(QStringLiteral("connect"));
     action->setText(i18n("&Connect"));
     connect(action, &QAction::triggered, connectSettingsDialog, &ConnectSettingsDialog::show);
 
     action = actionCollection()->addAction(QStringLiteral("profiles"));
     action->setText(i18n("&Profiles"));
     connect(action, &QAction::triggered, profilesDialog, &ProfilesDialog::show);
-    
-    action = actionCollection()->addAction(QStringLiteral("3d"), ui->view3DdockWidget->toggleViewAction());
-    action->setText(i18n("&3D"));
-    leftToolbar->addAction(action);
-
-    action = actionCollection()->addAction(QStringLiteral("gcode"), ui->gcodeDockWidget->toggleViewAction());
-    action->setText(i18n("&GCode"));
-    leftToolbar->addAction(action);
-// This causes the program to crash when opening a second file, why? Apparently conflicts with
-// the connect that also works with the guiFactory
-//     connect(action, &QAction::toggled, [=](bool b){
-//         b ? guiFactory()->addClient(m_curr_editor_view) : guiFactory()->removeClient(m_curr_editor_view);
-//     });
-    
-    action = actionCollection()->addAction(QStringLiteral("video"), ui->videoDockWidget->toggleViewAction());
-    action->setText(i18n("&Video"));
-    leftToolbar->addAction(action);
-
 
     #ifdef Q_OS_LINUX
     //only set icons from theme on linux
         actionCollection()->action(QStringLiteral("profiles"))->setIcon(QIcon::fromTheme("emblem-favorite"));
     #endif
     //use style's standardIcon for the icons we can.
     actionCollection()->action(QStringLiteral("open_gcode"))->setIcon(style()->standardIcon(QStyle::SP_DirOpenIcon));
 
     action = KStandardAction::quit(qApp, SLOT(quit()), actionCollection());
 
     setupGUI(Default, ":/atelierui");
 }
 
 void MainWindow::openFile()
 {
     QUrl fileNameFromDialog = QFileDialog::getOpenFileUrl(this, i18n("Open GCode"),
                               QDir::homePath(), i18n("GCode (*.gco *.gcode)"));
+/*
     if (!fileNameFromDialog.isEmpty()) {
         ui->gcodeEditorWidget->loadFile(fileNameFromDialog);
         ui->view3DWidget->drawModel(fileNameFromDialog.toString());
         const int tabs = ui->tabWidget->count();
         m_openFiles.append(fileNameFromDialog);
         for(int i=0; i < tabs; ++i){
             auto instance = qobject_cast<AtCoreInstanceWidget*>(ui->tabWidget->widget(i));
             instance->setOpenFiles(m_openFiles);
         }
     }
+    */
 }
 
 void MainWindow::newConnection(const QString& port, const QMap<QString, QVariant>& profile)
 {
+    /*
     const int tabs = ui->tabWidget->count();
     if(ui->tabWidget->count() == 1){
         auto instance = qobject_cast<AtCoreInstanceWidget*>(ui->tabWidget->currentWidget());
         if(!instance->connected()){
             instance->startConnection(port, profile);
             ui->tabWidget->setTabText(ui->tabWidget->currentIndex(), profile["name"].toString());
             return;
         }
     }
 
     auto newInstanceWidget = new AtCoreInstanceWidget();
     int index = ui->tabWidget->addTab(newInstanceWidget, QString::number(tabs+1));
     newInstanceWidget->startConnection(port, profile);
     ui->tabWidget->setTabText(index, profile["name"].toString());
-    
+    */
 }
diff --git a/src/mainwindow.h b/src/mainwindow.h
index f6fb649..6a0b506 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -1,54 +1,72 @@
 /* Atelier KDE Printer Host for 3D Printing
     Copyright (C) <2016>
     Author: Lays Rodrigues - laysrodrigues@gmail.com
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
 #include <QMainWindow>
 #include <QUrl>
 #include <QToolBar>
 #include <KXmlGui/KXmlGuiWindow>
 #include <KTextEditor/View>
 #include <dialogs/connectsettingsdialog.h>
 #include <dialogs/profilesdialog.h>
+#include <QStackedWidget>
+#include <QToolButton>
+#include <QMap>
+#include <QPair>
+#include <QToolButton>
+
 
 namespace Ui
 {
 class MainWindow;
 }
 
+struct LateralArea {
+    // Area with the the lateral buttons that will open the views.
+    // Kind like the KDevelop stuff but way simpler.
+    using Btn2Widget = QPair<QToolButton*, QWidget*>;
+    using WidgetMap = QMap<QString, Btn2Widget>;
+
+    QWidget *m_toolBar;
+    QStackedWidget *m_stack;
+    WidgetMap m_map;
+};
+
 class MainWindow : public KXmlGuiWindow
 {
     Q_OBJECT
 
 public:
     explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
 private:
     Ui::MainWindow *ui;
     QStringList firmwaresList;
     QList<QUrl> m_openFiles;
-    QToolBar *leftToolbar;
     ProfilesDialog *profilesDialog;
     ConnectSettingsDialog *connectSettingsDialog;
     KTextEditor::View *m_curr_editor_view;
+
+    LateralArea m_lateral;
+    void setupLateralArea();
     void initWidgets();
-    void buildToolbar();
     void setupActions();
     void openFile();
     void newConnection(const QString& port, const QMap<QString, QVariant>& profile);
 };
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index b01e155..a13c42d 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -1,121 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>MainWindow</class>
  <widget class="QMainWindow" name="MainWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>534</width>
-    <height>471</height>
+    <width>1074</width>
+    <height>627</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Atelier</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <layout class="QGridLayout" name="gridLayout">
-    <item row="0" column="0">
-     <widget class="QTabWidget" name="tabWidget">
-      <widget class="AtCoreInstanceWidget" name="tabWidgetPage1">
-       <attribute name="title">
-        <string>1</string>
-       </attribute>
-       <layout class="QGridLayout" name="gridLayout_2"/>
-      </widget>
-     </widget>
-    </item>
-   </layout>
+   <layout class="QGridLayout" name="gridLayout"/>
   </widget>
   <widget class="QMenuBar" name="menubar">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>534</width>
-     <height>30</height>
+     <width>1074</width>
+     <height>36</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
     <property name="title">
      <string>Fi&amp;le</string>
     </property>
    </widget>
    <widget class="QMenu" name="menuEdit">
     <property name="title">
      <string>Edit</string>
     </property>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menuEdit"/>
   </widget>
   <widget class="QStatusBar" name="statusBar">
    <property name="contextMenuPolicy">
     <enum>Qt::NoContextMenu</enum>
    </property>
    <property name="sizeGripEnabled">
     <bool>false</bool>
    </property>
   </widget>
-  <widget class="QDockWidget" name="view3DdockWidget">
-   <property name="windowTitle">
-    <string>&amp;3DView</string>
-   </property>
-   <attribute name="dockWidgetArea">
-    <number>1</number>
-   </attribute>
-   <widget class="Viewer3D" name="view3DWidget"/>
-  </widget>
-  <widget class="QDockWidget" name="gcodeDockWidget">
-   <property name="windowTitle">
-    <string>&amp;GCode </string>
-   </property>
-   <attribute name="dockWidgetArea">
-    <number>1</number>
-   </attribute>
-   <widget class="GCodeEditorWidget" name="gcodeEditorWidget"/>
-  </widget>
-  <widget class="QDockWidget" name="videoDockWidget">
-   <property name="windowTitle">
-    <string>&amp;Video</string>
-   </property>
-   <attribute name="dockWidgetArea">
-    <number>1</number>
-   </attribute>
-   <widget class="VideoMonitorWidget" name="videoMonitorWidget"/>
-  </widget>
   <action name="actionTeste">
    <property name="text">
     <string>Teste</string>
    </property>
   </action>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>GCodeEditorWidget</class>
-   <extends>QWidget</extends>
-   <header>widgets/gcodeeditorwidget.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>Viewer3D</class>
-   <extends>QWidget</extends>
-   <header>widgets/3dview/viewer3d.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>VideoMonitorWidget</class>
-   <extends>QWidget</extends>
-   <header>widgets/videomonitorwidget.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>AtCoreInstanceWidget</class>
-   <extends>QWidget</extends>
-   <header>widgets/atcoreinstancewidget.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>