diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 3feefa6..4a66433 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1,152 +1,155 @@
 /* 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 "widgets/gcodeeditorwidget.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());
 }
 
 void MainWindow::buildToolbar()
 {
+    leftToolbar->setObjectName("left_toolbar");
     leftToolbar->setOrientation(Qt::Vertical);
     leftToolbar->setMovable(true);
     leftToolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     addToolBar(Qt::LeftToolBarArea, leftToolbar);
 }
 
 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);
             return;
         }
     }
 
     auto newInstanceWidget = new AtCoreInstanceWidget();
     ui->tabWidget->addTab(newInstanceWidget, QString::number(tabs+1));
     newInstanceWidget->startConnection(port, profile);
 }