diff --git a/testclient/mainwindow.cpp b/testclient/mainwindow.cpp
index 482f220..66be678 100644
--- a/testclient/mainwindow.cpp
+++ b/testclient/mainwindow.cpp
@@ -1,626 +1,1001 @@
 /* AtCore Test Client
     Copyright (C) <2016>
 
     Authors:
         Patrick José Pereira <patrickelectric@gmail.com>
         Lays Rodrigues <laysrodrigues@gmail.com>
         Chris Rizzitello <rizzitello@kde.org>
         Tomaz Canabrava <tcanabrava@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 <QTime>
 #include <QSerialPortInfo>
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QTextStream>
 #include <QLoggingCategory>
 
 #include "mainwindow.h"
 #include "seriallayer.h"
 #include "gcodecommands.h"
 #include "widgets/axiscontrol.h"
 #include "widgets/about.h"
 
 Q_LOGGING_CATEGORY(TESTCLIENT_MAINWINDOW, "org.kde.atelier.core")
 
 int MainWindow::fanCount = 4;
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
-    ui(new Ui::MainWindow),
     core(new AtCore(this)),
     logFile(new QTemporaryFile(QDir::tempPath() + QStringLiteral("/AtCore_")))
 {
-    ui->setupUi(this);
+    setWindowTitle(tr("AtCore - Test Client"));
     setWindowIcon(QIcon(QStringLiteral(":/icon/windowIcon")));
     QCoreApplication::setApplicationVersion(core->version());
-    ui->serialPortCB->setEditable(true);
-    QValidator *validator = new QIntValidator();
-    ui->baudRateLE->setValidator(validator);
-    ui->baudRateLE->addItems(core->portSpeeds());
-    ui->baudRateLE->setCurrentIndex(9);
-
-    ui->pluginCB->addItem(tr("Autodetect"));
-    ui->pluginCB->addItems(core->availableFirmwarePlugins());
-
-    AxisControl *axisControl = new AxisControl;
-    ui->moveDockContents->layout()->addWidget(axisControl);
+    initMenu();
+    initStatusBar();
+    initWidgets();
 
     addLog(tr("Attempting to locate Serial Ports"));
     core->setSerialTimerInterval(1000);
-    setDangeriousDocksDisabled(true);
-    populateCBs();
 
-    //Icon for actionQuit
-#ifndef Q_OS_MAC
-    ui->actionQuit->setIcon(QIcon::fromTheme(QStringLiteral("application-exit")));
-#endif
-
-    //hide the printing progress bar.
-    ui->printLayout->setVisible(false);
-
-    ui->statusBar->addWidget(ui->statusBarWidget);
     printTime = new QTime();
     printTimer = new QTimer();
     printTimer->setInterval(1000);
     printTimer->setSingleShot(false);
     connect(printTimer, &QTimer::timeout, this, &MainWindow::updatePrintTime);
 
-    connect(ui->connectPB, &QPushButton::clicked, this, &MainWindow::connectPBClicked);
-    connect(ui->saveLogPB, &QPushButton::clicked, this, &MainWindow::saveLogPBClicked);
-    connect(ui->sendPB, &QPushButton::clicked, this, &MainWindow::sendPBClicked);
-    connect(ui->commandLE, &QLineEdit::returnPressed, this, &MainWindow::sendPBClicked);
-    connect(ui->homeAllPB, &QPushButton::clicked, this, &MainWindow::homeAllPBClicked);
-    connect(ui->homeXPB, &QPushButton::clicked, this, &MainWindow::homeXPBClicked);
-    connect(ui->homeYPB, &QPushButton::clicked, this, &MainWindow::homeYPBClicked);
-    connect(ui->homeZPB, &QPushButton::clicked, this, &MainWindow::homeZPBClicked);
-    connect(ui->bedTempPB, &QPushButton::clicked, this, &MainWindow::bedTempPBClicked);
-    connect(ui->extTempPB, &QPushButton::clicked, this, &MainWindow::extTempPBClicked);
-    connect(ui->mvAxisPB, &QPushButton::clicked, this, &MainWindow::mvAxisPBClicked);
-    connect(ui->fanSpeedPB, &QPushButton::clicked, this, &MainWindow::fanSpeedPBClicked);
-    connect(ui->printPB, &QPushButton::clicked, this, &MainWindow::printPBClicked);
-    connect(ui->sdPrintPB, &QPushButton::clicked, this, &MainWindow::sdPrintPBClicked);
-    connect(ui->sdDelPB, &QPushButton::clicked, this, &MainWindow::sdDelPBClicked);
-    connect(ui->printerSpeedPB, &QPushButton::clicked, this, &MainWindow::printerSpeedPBClicked);
-    connect(ui->flowRatePB, &QPushButton::clicked, this, &MainWindow::flowRatePBClicked);
-    connect(ui->showMessagePB, &QPushButton::clicked, this, &MainWindow::showMessage);
-    connect(ui->pluginCB, &QComboBox::currentTextChanged, this, &MainWindow::pluginCBChanged);
-    connect(ui->disableMotorsPB, &QPushButton::clicked, this, &MainWindow::disableMotorsPBClicked);
-    connect(ui->sdListPB, &QPushButton::clicked, this, &MainWindow::getSdList);
     connect(core, &AtCore::stateChanged, this, &MainWindow::printerStateChanged);
-    connect(ui->stopPB, &QPushButton::clicked, core, &AtCore::stop);
-    connect(ui->emergencyStopPB, &QPushButton::clicked, core, &AtCore::emergencyStop);
-    connect(axisControl, &AxisControl::clicked, this, &MainWindow::axisControlClicked);
     connect(core, &AtCore::portsChanged, this, &MainWindow::locateSerialPort);
     connect(core, &AtCore::printProgressChanged, this, &MainWindow::printProgressChanged);
     connect(core, &AtCore::sdMountChanged, this, &MainWindow::sdChanged);
 
     connect(core, &AtCore::sdCardFileListChanged, [ & ](QStringList fileList) {
-        ui->sdFileListView->clear();
-        ui->sdFileListView->addItems(fileList);
+        listSdFiles->clear();
+        listSdFiles->addItems(fileList);
     });
 
     connect(&core->temperature(), &Temperature::bedTemperatureChanged, [ this ](float temp) {
         checkTemperature(0x00, 0, temp);
-        ui->plotWidget->appendPoint(tr("Actual Bed"), temp);
-        ui->plotWidget->update();
+        plotWidget->appendPoint(tr("Actual Bed"), temp);
+        plotWidget->update();
     });
     connect(&core->temperature(), &Temperature::bedTargetTemperatureChanged, [ this ](float temp) {
         checkTemperature(0x01, 0, temp);
-        ui->plotWidget->appendPoint(tr("Target Bed"), temp);
-        ui->plotWidget->update();
+        plotWidget->appendPoint(tr("Target Bed"), temp);
+        plotWidget->update();
     });
     connect(&core->temperature(), &Temperature::extruderTemperatureChanged, [ this ](float temp) {
         checkTemperature(0x02, 0, temp);
-        ui->plotWidget->appendPoint(tr("Actual Ext.1"), temp);
-        ui->plotWidget->update();
+        plotWidget->appendPoint(tr("Actual Ext.1"), temp);
+        plotWidget->update();
     });
     connect(&core->temperature(), &Temperature::extruderTargetTemperatureChanged, [ this ](float temp) {
         checkTemperature(0x03, 0, temp);
-        ui->plotWidget->appendPoint(tr("Target Ext.1"), temp);
-        ui->plotWidget->update();
+        plotWidget->appendPoint(tr("Target Ext.1"), temp);
+        plotWidget->update();
     });
+}
+
+void MainWindow::initMenu()
+{
+    QMenu *menuFile = new QMenu(tr("File"));
+    QAction *actionQuit = new QAction(style()->standardIcon(QStyle::SP_DialogCloseButton), tr("Quit"));
+    connect(actionQuit, &QAction::triggered, this, &MainWindow::close);
+    menuFile->addAction(actionQuit);
 
-    connect(ui->actionQuit, &QAction::triggered, this, &MainWindow::close);
-    connect(ui->actionShowDockTitles, &QAction::toggled, this, &MainWindow::toggleDockTitles);
-    connect(ui->actionAbout, &QAction::triggered, this, &MainWindow::about);
+    menuView = new QMenu(tr("View"));
+    QAction *actionShowDockTitles = new QAction(tr("Show Dock Titles"));
+    actionShowDockTitles->setCheckable(true);
+    actionShowDockTitles->setChecked(true);
+    connect(actionShowDockTitles, &QAction::toggled, this, &MainWindow::toggleDockTitles);
+    menuView->addAction(actionShowDockTitles);
 
-    ui->menuView->insertAction(nullptr, ui->connectDock->toggleViewAction());
-    ui->menuView->insertAction(nullptr, ui->tempControlsDock->toggleViewAction());
-    ui->menuView->insertAction(nullptr, ui->commandDock->toggleViewAction());
-    ui->menuView->insertAction(nullptr, ui->printDock->toggleViewAction());
-    ui->menuView->insertAction(nullptr, ui->moveDock->toggleViewAction());
-    ui->menuView->insertAction(nullptr, ui->tempTimelineDock->toggleViewAction());
-    ui->menuView->insertAction(nullptr, ui->logDock->toggleViewAction());
-    ui->menuView->insertAction(nullptr, ui->sdDock->toggleViewAction());
+    QMenu *menuHelp = new QMenu(tr("Help"));
+    QAction *actionAbout = new QAction(tr("About"));
+    actionAbout->setShortcut(QKeySequence(Qt::Key_F1));
+    connect(actionAbout, &QAction::triggered, [] {
+        auto *dialog = new About;
+        dialog->exec();
+    });
+    menuHelp->addAction(actionAbout);
+
+    menuBar()->addMenu(menuFile);
+    menuBar()->addMenu(menuView);
+    menuBar()->addMenu(menuHelp);
+}
+
+void MainWindow::initStatusBar()
+{
+    //first create the item for the print Progress.
+    printingProgress = new QProgressBar;
+    auto *newButton = new QPushButton(style()->standardIcon(QStyle::SP_BrowserStop), QString());
+    connect(newButton, &QPushButton::clicked, core, &AtCore::stop);
+    lblTime = new QLabel(QStringLiteral("00:00:00"));
+    lblTime->setAlignment(Qt::AlignHCenter);
+    auto *newLabel = new QLabel(QStringLiteral(" / "));
+    lblTimeLeft = new QLabel(QStringLiteral("00:00:00"));
+    lblTimeLeft->setAlignment(Qt::AlignHCenter);
+
+    auto *hBoxLayout = new QHBoxLayout;
+    hBoxLayout->addWidget(printingProgress);
+    hBoxLayout->addWidget(newButton);
+    hBoxLayout->addWidget(lblTime);
+    hBoxLayout->addWidget(newLabel);
+    hBoxLayout->addWidget(lblTimeLeft);
+    printProgressWidget = new QWidget();
+    printProgressWidget->setLayout(hBoxLayout);
+
+    //Then Create the full bar.
+    newLabel = new QLabel(tr("AtCore State:"));
+    lblState = new QLabel(tr("Not Connected"));
+    lblSd = new QLabel();
+
+    hBoxLayout = new QHBoxLayout;
+    hBoxLayout->addWidget(newLabel);
+    hBoxLayout->addWidget(lblState);
+    hBoxLayout->addSpacerItem(new QSpacerItem(10, 20, QSizePolicy::Fixed));
+    hBoxLayout->addWidget(lblSd);
+    hBoxLayout->addSpacerItem(new QSpacerItem(40, 20, QSizePolicy::Expanding));
+    hBoxLayout->addWidget(printProgressWidget);
+
+    //Then put it all into a widget on the bar.
+    QWidget *sBar = new QWidget();
+    sBar->setLayout(hBoxLayout);
+    statusBar()->addPermanentWidget(sBar, 100);
+}
+
+void MainWindow::initWidgets()
+{
+    //Make the Docks
+    makeCommandDock();
+    makePrintDock();
+    makeTempTimelineDock();
+    makeLogDock();
+    makeConnectDock();
+    makeMoveDock();
+    makeTempControlsDock();
+    makeSdDock();
+
+    setDangeriousDocksDisabled(true);
 
-    //more dock stuff.
     setTabPosition(Qt::LeftDockWidgetArea, QTabWidget::North);
     setTabPosition(Qt::RightDockWidgetArea, QTabWidget::North);
-    tabifyDockWidget(ui->moveDock, ui->tempControlsDock);
-    tabifyDockWidget(ui->moveDock, ui->sdDock);
-    ui->moveDock->raise();
+    tabifyDockWidget(moveDock, tempControlsDock);
+    tabifyDockWidget(moveDock, sdDock);
+    moveDock->raise();
 
-    tabifyDockWidget(ui->connectDock, ui->printDock);
-    tabifyDockWidget(ui->connectDock, ui->commandDock);
-    ui->connectDock->raise();
+    tabifyDockWidget(connectDock, printDock);
+    tabifyDockWidget(connectDock, commandDock);
+    connectDock->raise();
     setCentralWidget(nullptr);
+
+    //More Gui stuff
+    populateCBs();
+    //hide the printing progress bar.
+    printProgressWidget->setVisible(false);
+}
+
+void MainWindow::makeCommandDock()
+{
+    //The processing for making a dock is the same for all docks
+    //Expose the least amount of object outside the creation function.
+
+    // First we make our mainLayout for the dock.
+    auto *mainLayout = new QVBoxLayout;
+
+    //Begin making content from top to bottom or left to right.
+    //Making child layouts in the order you want to put them
+    // onto the mainLayout
+    lineCommand = new QLineEdit;
+    lineCommand->setPlaceholderText(tr("Send Command"));
+
+    //we have a few buttons to make here. Lets name this newButton so its easier to reuse
+    auto *newButton = new QPushButton(tr("Send"));
+    connect(newButton, &QPushButton::clicked, this, &MainWindow::sendPBClicked);
+
+    //When you have created a Row put the items into layout.
+    auto *hBoxLayout = new QHBoxLayout;
+    hBoxLayout->addWidget(lineCommand);
+    hBoxLayout->addWidget(newButton);
+    //Put the Layout or Widget on the mainLayout when its finished.
+    //This will free your pointers for reuse.
+    mainLayout->addLayout(hBoxLayout);
+
+    //Start making items for the next layout to place onto the mainLayout.
+    lineMessage = new QLineEdit;
+    lineMessage->setPlaceholderText(tr("Show Message"));
+
+    //Here we reuse our  button pointer my having it point to a new button.
+    newButton = new QPushButton(tr("Send"));
+    connect(newButton, &QPushButton::clicked, this, &MainWindow::showMessage);
+
+    //We reuse the hBoxLayout pointer in the same way as the button pointer.
+    hBoxLayout = new QHBoxLayout;
+    hBoxLayout->addWidget(lineMessage);
+    hBoxLayout->addWidget(newButton);
+    mainLayout->addLayout(hBoxLayout);
+
+    //QDockWidget::setLayout is not ment to be used by us
+    //We must instead Create a widget to hold or dock contents.
+    auto *dockContents = new QWidget;
+    dockContents->setLayout(mainLayout);
+
+    //Finally create the dock, and set the Widget.
+    commandDock = new QDockWidget(tr("Commands"), this);
+    commandDock->setWidget(dockContents);
+
+    //Push the toggle view action into our view menu
+    menuView->insertAction(nullptr, commandDock->toggleViewAction());
+
+    //Place the Dock into a DockWidget Area.
+    //Failure todo this will create some odd side effects at runtime
+    addDockWidget(Qt::LeftDockWidgetArea, commandDock);
+}
+
+void MainWindow::makePrintDock()
+{
+    auto *mainLayout = new QVBoxLayout;
+
+    buttonPrint = new QPushButton(tr("Print File"));
+    connect(buttonPrint, &QPushButton::clicked, this, &MainWindow::printPBClicked);
+
+    auto *newButton = new QPushButton(tr("Emergency Stop"));
+    connect(newButton, &QPushButton::clicked, core, &AtCore::emergencyStop);
+
+    auto *hBoxLayout = new QHBoxLayout;
+    hBoxLayout->addWidget(buttonPrint);
+    hBoxLayout->addWidget(newButton);
+    mainLayout->addLayout(hBoxLayout);
+
+    auto *newLabel = new QLabel(tr("On Pause:"));
+    linePostPause = new QLineEdit;
+    linePostPause->setPlaceholderText(QStringLiteral("G91,G0 Z1,G90,G1 X0 Y195"));
+
+    hBoxLayout = new QHBoxLayout;
+    hBoxLayout->addWidget(newLabel);
+    hBoxLayout->addWidget(linePostPause);
+    mainLayout->addLayout(hBoxLayout);
+
+    newLabel = new QLabel(tr("Printer Speed"));
+    sbPrintSpeed = new QSpinBox;
+    sbPrintSpeed->setRange(1, 300);
+    sbPrintSpeed->setValue(100);
+    sbPrintSpeed->setSuffix(QStringLiteral("%"));
+
+    newButton = new QPushButton(tr("Set"));
+    connect(newButton, &QPushButton::clicked, this, &MainWindow::printerSpeedPBClicked);
+
+    hBoxLayout = new QHBoxLayout;
+    hBoxLayout->addWidget(newLabel, 35);
+    hBoxLayout->addWidget(sbPrintSpeed, 10);
+    hBoxLayout->addWidget(newButton, 20);
+    mainLayout->addLayout(hBoxLayout);
+
+    newLabel = new QLabel(tr("Flow Rate"));
+    sbFlowRate = new QSpinBox;
+    sbFlowRate->setRange(1, 300);
+    sbFlowRate->setValue(100);
+    sbFlowRate->setSuffix(QStringLiteral("%"));
+
+    newButton = new QPushButton(tr("Set"));
+    connect(newButton, &QPushButton::clicked, this, &MainWindow::flowRatePBClicked);
+
+    hBoxLayout = new QHBoxLayout;
+    hBoxLayout->addWidget(newLabel, 35);
+    hBoxLayout->addWidget(sbFlowRate, 10);
+    hBoxLayout->addWidget(newButton, 20);
+    mainLayout->addLayout(hBoxLayout);
+
+    auto *dockContents = new QWidget;
+    dockContents->setLayout(mainLayout);
+
+    printDock = new QDockWidget(tr("Print"), this);
+    printDock->setWidget(dockContents);
+
+    menuView->insertAction(nullptr, printDock->toggleViewAction());
+    addDockWidget(Qt::LeftDockWidgetArea, printDock);
+}
+
+void MainWindow::makeTempTimelineDock()
+{
+    plotWidget = new PlotWidget;
+    tempTimelineDock = new QDockWidget(tr("Temperature Timeline"), this);
+    tempTimelineDock->setWidget(plotWidget);
+    menuView->insertAction(nullptr, tempTimelineDock->toggleViewAction());
+    addDockWidget(Qt::RightDockWidgetArea, tempTimelineDock);
+}
+
+void MainWindow::makeLogDock()
+{
+    textLog = new QPlainTextEdit;
+    textLog->setReadOnly(true);
+    textLog->setMaximumBlockCount(1000);
+
+    auto *newButton = new QPushButton(style()->standardIcon(QStyle::SP_DialogSaveButton), tr("Save Session Log"));
+    connect(newButton, &QPushButton::clicked, this, &MainWindow::saveLogPBClicked);
+
+    auto *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(textLog);
+    mainLayout->addWidget(newButton);
+
+    auto *dockContents = new QWidget();
+    dockContents->setLayout(mainLayout);
+
+    logDock = new QDockWidget(tr("Session Log"), this);
+    logDock->setWidget(dockContents);
+
+    menuView->insertAction(nullptr, logDock->toggleViewAction());
+    addDockWidget(Qt::RightDockWidgetArea, logDock);
+}
+
+void MainWindow::makeConnectDock()
+{
+    auto *mainLayout = new QVBoxLayout;
+    auto *newLabel = new QLabel(tr("Port:"));
+
+    comboPort = new QComboBox;
+    comboPort->setEditable(true);
+
+    auto *hBoxLayout = new QHBoxLayout;
+    hBoxLayout->addWidget(newLabel);
+    hBoxLayout->addWidget(comboPort, 75);
+    mainLayout->addLayout(hBoxLayout);
+
+    newLabel = new QLabel(tr("Baud Rate:"));
+    comboBAUD = new QComboBox;
+    comboBAUD->addItems(core->portSpeeds());
+    comboBAUD->setCurrentIndex(9);
+
+    hBoxLayout = new QHBoxLayout;
+    hBoxLayout->addWidget(newLabel);
+    hBoxLayout->addWidget(comboBAUD, 75);
+    mainLayout->addLayout(hBoxLayout);
+
+    newLabel = new QLabel(tr("Use Plugin:"));
+    comboPlugin = new QComboBox;
+    comboPlugin->addItem(tr("Autodetect"));
+    comboPlugin->addItems(core->availableFirmwarePlugins());
+    connect(comboPlugin, &QComboBox::currentTextChanged, this, &MainWindow::pluginCBChanged);
+
+    hBoxLayout = new QHBoxLayout;
+    hBoxLayout->addWidget(newLabel);
+    hBoxLayout->addWidget(comboPlugin, 75);
+    mainLayout->addLayout(hBoxLayout);
+
+    buttonConnect = new QPushButton(tr("Connect"));
+    connect(buttonConnect, &QPushButton::clicked, this, &MainWindow::connectPBClicked);
+    mainLayout->addWidget(buttonConnect);
+
+    auto *dockContents = new QWidget;
+    dockContents->setLayout(mainLayout);
+
+    connectDock = new QDockWidget(tr("Connect"), this);
+    connectDock->setWidget(dockContents);
+
+    menuView->insertAction(nullptr, connectDock->toggleViewAction());
+    addDockWidget(Qt::LeftDockWidgetArea, connectDock);
+}
+
+void MainWindow::makeMoveDock()
+{
+    auto *mainLayout = new QVBoxLayout;
+    auto *hBoxLayout = new QHBoxLayout;
+
+    auto *newButton = new QPushButton(tr("Home All"));
+    connect(newButton, &QPushButton::clicked, this, &MainWindow::homeAllPBClicked);
+    hBoxLayout->addWidget(newButton);
+
+    newButton = new QPushButton(tr("Home X"));
+    connect(newButton, &QPushButton::clicked, this, &MainWindow::homeXPBClicked);
+    hBoxLayout->addWidget(newButton);
+
+    newButton = new QPushButton(tr("Home Y"));
+    connect(newButton, &QPushButton::clicked, this, &MainWindow::homeYPBClicked);
+    hBoxLayout->addWidget(newButton);
+
+    newButton = new QPushButton(tr("Home Z"));
+    connect(newButton, &QPushButton::clicked, this, &MainWindow::homeZPBClicked);
+    hBoxLayout->addWidget(newButton);
+
+    mainLayout->addLayout(hBoxLayout);
+
+    comboMoveAxis = new QComboBox;
+    comboMoveAxis->addItem(tr("Move X Axis to"));
+    comboMoveAxis->addItem(tr("Move Y Axis to"));
+    comboMoveAxis->addItem(tr("Move Z Axis to"));
+
+    sbMoveAxis = new QDoubleSpinBox;
+    sbMoveAxis->setRange(0, 200);
+
+    newButton = new QPushButton(tr("Go"));
+    connect(newButton, &QPushButton::clicked, this, &MainWindow::mvAxisPBClicked);
+
+    hBoxLayout = new QHBoxLayout;
+    hBoxLayout->addWidget(comboMoveAxis);
+    hBoxLayout->addWidget(sbMoveAxis);
+    hBoxLayout->addWidget(newButton);
+    mainLayout->addLayout(hBoxLayout);
+
+    newButton = new QPushButton(tr("Disable Motors"));
+    connect(newButton, &QPushButton::clicked, this, &MainWindow::disableMotorsPBClicked);
+    mainLayout->addWidget(newButton);
+
+    auto *axisControl = new AxisControl;
+    connect(axisControl, &AxisControl::clicked, this, &MainWindow::axisControlClicked);
+    mainLayout->addWidget(axisControl);
+
+    auto *dockContents = new QWidget;
+    dockContents->setLayout(mainLayout);
+
+    moveDock = new QDockWidget(tr("Movement"), this);
+    moveDock->setWidget(dockContents);
+
+    menuView->insertAction(nullptr, moveDock->toggleViewAction());
+    addDockWidget(Qt::LeftDockWidgetArea, moveDock);
+}
+
+void MainWindow::makeTempControlsDock()
+{
+    auto *mainLayout = new QVBoxLayout;
+    checkAndWait = new QCheckBox(tr("Wait Untill Temperature Stablizes"));
+    mainLayout->addWidget(checkAndWait);
+
+    auto label = new QLabel(tr("Bed Temp"));
+
+    sbBedTemp = new QSpinBox;
+    sbBedTemp->setRange(0, 120);
+    sbBedTemp->setSuffix(QStringLiteral("°C"));
+
+    auto *newButton = new QPushButton(tr("Set"));
+    connect(newButton, &QPushButton::clicked, this, &MainWindow::bedTempPBClicked);
+
+    auto *hboxLayout = new QHBoxLayout;
+    hboxLayout->addWidget(label, 80);
+    hboxLayout->addWidget(sbBedTemp);
+    hboxLayout->addWidget(newButton);
+    mainLayout->addItem(hboxLayout);
+
+    comboExtruderSelect = new QComboBox;
+    sbExtruderTemp = new QSpinBox;
+    sbExtruderTemp->setRange(0, 275);
+    sbExtruderTemp->setSuffix(QStringLiteral("°C"));
+
+    newButton = new QPushButton(tr("Set"));
+    connect(newButton, &QPushButton::clicked, this, &MainWindow::extTempPBClicked);
+    hboxLayout = new QHBoxLayout;
+    hboxLayout->addWidget(comboExtruderSelect, 80);
+    hboxLayout->addWidget(sbExtruderTemp);
+    hboxLayout->addWidget(newButton);
+    mainLayout->addItem(hboxLayout);
+
+    comboFanSelect = new QComboBox;
+    sbFanSpeed = new QSpinBox;
+    sbFanSpeed->setRange(0, 100);
+    sbFanSpeed->setSuffix(QStringLiteral("%"));
+
+    newButton = new QPushButton(tr("Set"));
+    connect(newButton, &QPushButton::clicked, this, &MainWindow::fanSpeedPBClicked);
+    hboxLayout = new QHBoxLayout;
+    hboxLayout->addWidget(comboFanSelect, 80);
+    hboxLayout->addWidget(sbFanSpeed);
+    hboxLayout->addWidget(newButton);
+    mainLayout->addItem(hboxLayout);
+
+    auto *dockContents = new QWidget;
+    dockContents->setLayout(mainLayout);
+
+    tempControlsDock = new QDockWidget(tr("Temperatures"), this);
+    tempControlsDock->setWidget(dockContents);
+
+    menuView->insertAction(nullptr, tempControlsDock->toggleViewAction());
+    addDockWidget(Qt::LeftDockWidgetArea, tempControlsDock);
+}
+
+void MainWindow::makeSdDock()
+{
+    auto *hBoxLayout = new QHBoxLayout;
+
+    auto *newButton = new QPushButton(tr("Get List"));
+    connect(newButton, &QPushButton::clicked, this, &MainWindow::getSdList);
+    hBoxLayout->addWidget(newButton);
+
+    newButton = new QPushButton(tr("Print Selected"));
+    connect(newButton, &QPushButton::clicked, this, &MainWindow::sdPrintPBClicked);
+    hBoxLayout->addWidget(newButton);
+
+    newButton = new QPushButton(tr("Delete Selected"));
+    connect(newButton, &QPushButton::clicked, this, &MainWindow::sdDelPBClicked);
+    hBoxLayout->addWidget(newButton);
+
+    auto *groupFiles =  new QGroupBox(tr("Files On Sd Card"));
+    listSdFiles = new QListWidget;
+    auto *groupLayout = new QVBoxLayout;
+    groupLayout->addWidget(listSdFiles);
+    groupFiles->setLayout(groupLayout);
+
+    auto *mainLayout = new QVBoxLayout;
+    mainLayout->addItem(hBoxLayout);
+    mainLayout->addWidget(groupFiles);
+
+    auto *dockContents = new QWidget;
+    dockContents->setLayout(mainLayout);
+
+    sdDock = new QDockWidget(tr("Sd Card"), this);
+    sdDock->setWidget(dockContents);
+
+    menuView->insertAction(nullptr, sdDock->toggleViewAction());
+    addDockWidget(Qt::LeftDockWidgetArea, sdDock);
 }
 
 void MainWindow::closeEvent(QCloseEvent *event)
 {
     core->close();
     event->accept();
 }
 
 MainWindow::~MainWindow()
 {
     delete logFile;
-    delete ui;
 }
 
 QString MainWindow::getTime()
 {
     return QTime::currentTime().toString(QStringLiteral("hh:mm:ss:zzz"));
 }
 
 QString MainWindow::logHeader()
 {
     return QStringLiteral("[%1]  ").arg(getTime());
 }
 
 QString MainWindow::rLogHeader()
 {
     return QStringLiteral("[%1]< ").arg(getTime());
 }
 
 QString MainWindow::sLogHeader()
 {
     return QStringLiteral("[%1]> ").arg(getTime());
 }
 
 void MainWindow::writeTempFile(QString text)
 {
     /*
     A QTemporaryFile will always be opened in QIODevice::ReadWrite mode,
     this allows easy access to the data in the file. This function will
     return true upon success and will set the fileName() to the unique
     filename used.
     */
     logFile->open();
     logFile->seek(logFile->size());
     logFile->write(text.toLatin1());
     logFile->putChar('\n');
     logFile->close();
 }
 
 void MainWindow::addLog(QString msg)
 {
     QString message(logHeader() + msg);
-    ui->logTE->appendPlainText(message);
+    textLog->appendPlainText(message);
     writeTempFile(message);
 }
 
 void MainWindow::addRLog(QString msg)
 {
     QString message(rLogHeader() + msg);
-    ui->logTE->appendPlainText(message);
+    textLog->appendPlainText(message);
     writeTempFile(message);
 }
 
 void MainWindow::addSLog(QString msg)
 {
     QString message(sLogHeader() + msg);
-    ui->logTE->appendPlainText(message);
+    textLog->appendPlainText(message);
     writeTempFile(message);
 }
 
 void MainWindow::checkReceivedCommand(const QByteArray &message)
 {
     addRLog(QString::fromUtf8(message));
 }
 
 void MainWindow::checkPushedCommands(QByteArray bmsg)
 {
     QString msg = QString::fromUtf8(bmsg);
     QRegExp _newLine(QChar::fromLatin1('\n'));
     QRegExp _return(QChar::fromLatin1('\r'));
     msg.replace(_newLine, QStringLiteral("\\n"));
     msg.replace(_return, QStringLiteral("\\r"));
     addSLog(msg);
 }
 
 void MainWindow::checkTemperature(uint sensorType, uint number, uint temp)
 {
     QString msg;
     switch (sensorType) {
     case 0x00: // bed
         msg = QString::fromLatin1("Bed Temperature ");
         break;
 
     case 0x01: // bed target
         msg = QString::fromLatin1("Bed Target Temperature ");
         break;
 
     case 0x02: // extruder
         msg = QString::fromLatin1("Extruder Temperature ");
         break;
 
     case 0x03: // extruder target
         msg = QString::fromLatin1("Extruder Target Temperature ");
         break;
 
     case 0x04: // enclosure
         msg = QString::fromLatin1("Enclosure Temperature ");
         break;
 
     case 0x05: // enclosure target
         msg = QString::fromLatin1("Enclosure Target Temperature ");
         break;
     }
 
     msg.append(QString::fromLatin1("[%1] : %2"));
     msg = msg.arg(QString::number(number))
           .arg(QString::number(temp));
 
     addRLog(msg);
 }
 /**
  * @brief MainWindow::locateSerialPort
  * Locate all active serial ports on the computer and add to the list
  * of serial ports
  */
 void MainWindow::locateSerialPort(const QStringList &ports)
 {
-    ui->serialPortCB->clear();
+    comboPort->clear();
     if (!ports.isEmpty()) {
-        ui->serialPortCB->addItems(ports);
+        comboPort->addItems(ports);
         addLog(tr("Found %1 Ports").arg(QString::number(ports.count())));
     } else {
         QString portError(tr("No available ports! Please connect a serial device to continue!"));
-        if (! ui->logTE->toPlainText().endsWith(portError)) {
+        if (! textLog->toPlainText().endsWith(portError)) {
             addLog(portError);
         }
     }
 }
 
 void MainWindow::connectPBClicked()
 {
     if (core->state() == AtCore::DISCONNECTED) {
-        if (core->initSerial(ui->serialPortCB->currentText(), ui->baudRateLE->currentText().toInt())) {
+        if (core->initSerial(comboPort->currentText(), comboBAUD->currentText().toInt())) {
             connect(core, &AtCore::receivedMessage, this, &MainWindow::checkReceivedCommand);
             connect(core->serial(), &SerialLayer::pushedCommand, this, &MainWindow::checkPushedCommands);
-            ui->connectPB->setText(tr("Disconnect"));
+            buttonConnect->setText(tr("Disconnect"));
             addLog(tr("Serial connected"));
-            if (ui->pluginCB->currentText().contains(tr("Autodetect"))) {
+            if (comboPlugin->currentText().contains(tr("Autodetect"))) {
                 addLog(tr("No plugin loaded !"));
                 addLog(tr("Requesting Firmware..."));
             } else {
-                core->loadFirmwarePlugin(ui->pluginCB->currentText());
+                core->loadFirmwarePlugin(comboPlugin->currentText());
             }
         } else {
             addLog(tr("Failed to open serial in r/w mode"));
         }
     } else {
         disconnect(core, &AtCore::receivedMessage, this, &MainWindow::checkReceivedCommand);
         disconnect(core->serial(), &SerialLayer::pushedCommand, this, &MainWindow::checkPushedCommands);
         core->closeConnection();
         core->setState(AtCore::DISCONNECTED);
         addLog(tr("Disconnected"));
-        ui->connectPB->setText(tr("Connect"));
+        buttonConnect->setText(tr("Connect"));
     }
 }
 
 void MainWindow::sendPBClicked()
 {
-    QString comm = ui->commandLE->text().toUpper();
+    QString comm = lineCommand->text().toUpper();
     core->pushCommand(comm);
-    ui->commandLE->clear();
+    lineCommand->clear();
 }
 
 void MainWindow::homeAllPBClicked()
 {
     addSLog(tr("Home All"));
     core->home();
 }
 
 void MainWindow::homeXPBClicked()
 {
     addSLog(tr("Home X"));
     core->home(AtCore::X);
 }
 
 void MainWindow::homeYPBClicked()
 {
     addSLog(tr("Home Y"));
     core->home(AtCore::Y);
 }
 
 void MainWindow::homeZPBClicked()
 {
     addSLog(tr("Home Z"));
     core->home(AtCore::Z);
 }
 
 void MainWindow::bedTempPBClicked()
 {
-    if (ui->cb_andWait->isChecked()) {
+    if (checkAndWait->isChecked()) {
         addSLog(GCode::description(GCode::M190));
     } else {
         addSLog(GCode::description(GCode::M140));
     }
-    core->setBedTemp(ui->bedTempSB->value(), ui->cb_andWait->isChecked());
+    core->setBedTemp(sbBedTemp->value(), checkAndWait->isChecked());
 }
 
 void MainWindow::extTempPBClicked()
 {
-    if (ui->cb_andWait->isChecked()) {
+    if (checkAndWait->isChecked()) {
         addSLog(GCode::description(GCode::M109));
     } else {
         addSLog(GCode::description(GCode::M104));
     }
-    core->setExtruderTemp(ui->extTempSB->value(), ui->extTempSelCB->currentIndex(), ui->cb_andWait->isChecked());
+    core->setExtruderTemp(sbExtruderTemp->value(), comboExtruderSelect->currentIndex(), checkAndWait->isChecked());
 }
 
 void MainWindow::mvAxisPBClicked()
 {
     addSLog(GCode::description(GCode::G1));
-    if (ui->mvAxisCB->currentIndex() == 0) {
-        core->move(AtCore::X, ui->mvAxisSB->value());
-    } else if (ui->mvAxisCB->currentIndex() == 1) {
-        core->move(AtCore::Y, ui->mvAxisSB->value());
-    } else if (ui->mvAxisCB->currentIndex() == 2) {
-        core->move(AtCore::Z, ui->mvAxisSB->value());
+    if (comboMoveAxis->currentIndex() == 0) {
+        core->move(AtCore::X, sbMoveAxis->value());
+    } else if (comboMoveAxis->currentIndex() == 1) {
+        core->move(AtCore::Y, sbMoveAxis->value());
+    } else if (comboMoveAxis->currentIndex() == 2) {
+        core->move(AtCore::Z, sbMoveAxis->value());
     }
 }
 
 void MainWindow::fanSpeedPBClicked()
 {
     addSLog(GCode::description(GCode::M106));
-    core->setFanSpeed(ui->fanSpeedSB->value(), ui->fanSpeedSelCB->currentIndex());
+    core->setFanSpeed(sbFanSpeed->value(), comboFanSelect->currentIndex());
 }
 
 void MainWindow::printPBClicked()
 {
     QString fileName;
     switch (core->state()) {
 
     case AtCore::DISCONNECTED:
         QMessageBox::information(this, tr("Error"), tr("Not Connected To a Printer"));
         break;
 
     case AtCore::CONNECTING:
         QMessageBox::information(this, tr("Error"), tr(" A Firmware Plugin was not loaded!\n  Please send the command M115 and let us know what your firmware returns, so we can improve our firmware detection. We have loaded the most common plugin \"repetier\" for you. You may try to print again after this message"));
-        ui->pluginCB->setCurrentText(QStringLiteral("repetier"));
+        comboPlugin->setCurrentText(QStringLiteral("repetier"));
         break;
 
     case AtCore::IDLE:
-        fileName = QFileDialog::getOpenFileName(this, tr("Select a file to print"), QDir::homePath(), QStringLiteral("*.gcode"));
+        fileName = QFileDialog::getOpenFileName(this, tr("Select a file to print"), QDir::homePath(), tr("*.gcode"));
         if (fileName.isNull()) {
             addLog(tr("No File Selected"));
         } else {
             addLog(tr("Print: %1").arg(fileName));
             core->print(fileName);
         }
         break;
 
     case AtCore::BUSY:
-        core->pause(ui->postPauseLE->text());
+        core->pause(linePostPause->text());
         break;
 
     case AtCore::PAUSE:
         core->resume();
         break;
 
     default:
         qCDebug(TESTCLIENT_MAINWINDOW) << "ERROR / STOP unhandled.";
     }
 }
 
 void MainWindow::saveLogPBClicked()
 {
     // Note that if a file with the name newName already exists, copy() returns false (i.e. QFile will not overwrite it).
     QString fileName = QDir::homePath() + QChar::fromLatin1('/') + QFileInfo(logFile->fileName()).fileName() + QStringLiteral(".txt");
     QString saveFileName = QFileDialog::getSaveFileName(this, tr("Save Log to file"), fileName);
     QFile::copy(logFile->fileName(), saveFileName);
     logFile->close();
 }
 void MainWindow::pluginCBChanged(QString currentText)
 {
     if (core->state() != AtCore::DISCONNECTED) {
         if (!currentText.contains(tr("Autodetect"))) {
             core->loadFirmwarePlugin(currentText);
         }
     }
 }
 
 void MainWindow::flowRatePBClicked()
 {
-    core->setFlowRate(ui->flowRateSB->value());
+    core->setFlowRate(sbFlowRate->value());
 }
 
 void MainWindow::printerSpeedPBClicked()
 {
-    core->setPrinterSpeed(ui->printerSpeedSB->value());
+    core->setPrinterSpeed(sbPrintSpeed->value());
 }
 
 void MainWindow::printerStateChanged(AtCore::STATES state)
 {
     QString stateString;
     switch (state) {
     case AtCore::IDLE:
-        ui->printPB->setText(tr("Print File"));
-        stateString = QStringLiteral("Connected to ") + core->connectedPort();
+        buttonPrint->setText(tr("Print File"));
+        stateString = tr("Connected to ") + core->connectedPort();
         break;
 
     case AtCore::STARTPRINT:
-        stateString = QStringLiteral("START PRINT");
-        ui->printPB->setText(tr("Pause Print"));
-        ui->printLayout->setVisible(true);
+        stateString = tr("START PRINT");
+        buttonPrint->setText(tr("Pause Print"));
+        printProgressWidget->setVisible(true);
         printTime->start();
         printTimer->start();
         break;
 
     case AtCore::FINISHEDPRINT:
-        stateString = QStringLiteral("Finished Print");
-        ui->printPB->setText(tr("Print File"));
-        ui->printLayout->setVisible(false);
+        stateString = tr("Finished Print");
+        buttonPrint->setText(tr("Print File"));
+        printProgressWidget->setVisible(false);
         printTimer->stop();
         break;
 
     case AtCore::PAUSE:
-        stateString = QStringLiteral("Paused");
-        ui->printPB->setText(tr("Resume Print"));
+        stateString = tr("Paused");
+        buttonPrint->setText(tr("Resume Print"));
         break;
 
     case AtCore::BUSY:
-        stateString = QStringLiteral("Printing");
-        ui->printPB->setText(tr("Pause Print"));
+        stateString = tr("Printing");
+        buttonPrint->setText(tr("Pause Print"));
         break;
 
     case AtCore::DISCONNECTED:
         stateString = QStringLiteral("Not Connected");
         setDangeriousDocksDisabled(true);
         break;
 
     case AtCore::CONNECTING:
         stateString = QStringLiteral("Connecting");
         setDangeriousDocksDisabled(false);
         break;
 
     case AtCore::STOP:
-        stateString = QStringLiteral("Stoping Print");
+        stateString = tr("Stoping Print");
         break;
 
     case AtCore::ERRORSTATE:
-        stateString = QStringLiteral("Command ERROR");
+        stateString = tr("Command ERROR");
         break;
     }
-    ui->lblState->setText(stateString);
+    lblState->setText(stateString);
 }
 
 void MainWindow::populateCBs()
 {
     // Extruders
     for (int count = 0; count < core->extruderCount(); count++) {
-        ui->extTempSelCB->insertItem(count, tr("Extruder %1").arg(count));
+        comboExtruderSelect->insertItem(count, tr("Extruder %1").arg(count));
     }
 
     // Fan
     for (int count = 0; count < fanCount; count++) {
-        ui->fanSpeedSelCB->insertItem(count, tr("Fan %1 speed").arg(count));
+        comboFanSelect->insertItem(count, tr("Fan %1 speed").arg(count));
     }
 }
 
 void MainWindow::showMessage()
 {
-    core->showMessage(ui->messageLE->text());
+    core->showMessage(lineMessage->text());
 }
 
 void MainWindow::updatePrintTime()
 {
     QTime temp(0, 0, 0);
-    ui->time->setText(temp.addMSecs(printTime->elapsed()).toString(QStringLiteral("hh:mm:ss")));
+    lblTime->setText(temp.addMSecs(printTime->elapsed()).toString(QStringLiteral("hh:mm:ss")));
 }
 
 void MainWindow::printProgressChanged(int progress)
 {
-    ui->printingProgress->setValue(progress);
+    printingProgress->setValue(progress);
     if (progress > 0) {
         QTime temp(0, 0, 0);
-        ui->timeLeft->setText(temp.addMSecs((100 - progress) * (printTime->elapsed() / progress)).toString(QStringLiteral("hh:mm:ss")));
+        lblTimeLeft->setText(temp.addMSecs((100 - progress) * (printTime->elapsed() / progress)).toString(QStringLiteral("hh:mm:ss")));
     } else {
-        ui->timeLeft->setText(QStringLiteral("??:??:??"));
+        lblTimeLeft->setText(QStringLiteral("??:??:??"));
     }
 }
-void MainWindow::toggleDockTitles()
-{
-    if (ui->actionShowDockTitles->isChecked()) {
-        delete ui->connectDock->titleBarWidget();
-        delete ui->logDock->titleBarWidget();
-        delete ui->tempTimelineDock->titleBarWidget();
-        delete ui->commandDock->titleBarWidget();
-        delete ui->moveDock->titleBarWidget();
-        delete ui->tempControlsDock->titleBarWidget();
-        delete ui->printDock->titleBarWidget();
-        delete ui->sdDock->titleBarWidget();
+void MainWindow::toggleDockTitles(bool checked)
+{
+    if (checked) {
+        delete connectDock->titleBarWidget();
+        delete logDock->titleBarWidget();
+        delete tempTimelineDock->titleBarWidget();
+        delete commandDock->titleBarWidget();
+        delete moveDock->titleBarWidget();
+        delete tempControlsDock->titleBarWidget();
+        delete printDock->titleBarWidget();
+        delete sdDock->titleBarWidget();
     } else {
-        ui->connectDock->setTitleBarWidget(new QWidget());
-        ui->logDock->setTitleBarWidget(new QWidget());
-        ui->tempTimelineDock->setTitleBarWidget(new QWidget());
-        ui->commandDock->setTitleBarWidget(new QWidget());
-        ui->moveDock->setTitleBarWidget(new QWidget());
-        ui->tempControlsDock->setTitleBarWidget(new QWidget());
-        ui->printDock->setTitleBarWidget(new QWidget());
-        ui->sdDock->setTitleBarWidget(new QWidget());
+        connectDock->setTitleBarWidget(new QWidget());
+        logDock->setTitleBarWidget(new QWidget());
+        tempTimelineDock->setTitleBarWidget(new QWidget());
+        commandDock->setTitleBarWidget(new QWidget());
+        moveDock->setTitleBarWidget(new QWidget());
+        tempControlsDock->setTitleBarWidget(new QWidget());
+        printDock->setTitleBarWidget(new QWidget());
+        sdDock->setTitleBarWidget(new QWidget());
     }
 }
 
 void MainWindow::setDangeriousDocksDisabled(bool disabled)
 {
-    ui->commandDock->widget()->setDisabled(disabled);
-    ui->moveDock->widget()->setDisabled(disabled);
-    ui->tempControlsDock->widget()->setDisabled(disabled);
-    ui->printDock->widget()->setDisabled(disabled);
-    ui->sdDock->widget()->setDisabled(disabled);
-}
-
-void MainWindow::about()
-{
-    About *aboutDialog = new About(this);
-    aboutDialog->exec();
+    commandDock->widget()->setDisabled(disabled);
+    moveDock->widget()->setDisabled(disabled);
+    tempControlsDock->widget()->setDisabled(disabled);
+    printDock->widget()->setDisabled(disabled);
+    sdDock->widget()->setDisabled(disabled);
 }
 
 void MainWindow::axisControlClicked(QLatin1Char axis, int value)
 {
     core->setRelativePosition();
     core->move(axis, value);
     core->setAbsolutePosition();
 }
 
 void MainWindow::disableMotorsPBClicked()
 {
     core->disableMotors(0);
 }
 
 void MainWindow::sdChanged(bool mounted)
 {
-    QString labelText = mounted ? QStringLiteral("SD") : QString();
-    ui->lbl_sd->setText(labelText);
+    QString labelText = mounted ? tr("SD") : QString();
+    lblSd->setText(labelText);
 }
 
 void MainWindow::getSdList()
 {
     core->sdFileList();
 }
 
 void MainWindow::sdPrintPBClicked()
 {
-    if (ui->sdFileListView->currentRow() < 0) {
-        QMessageBox::information(this, QStringLiteral("Print Error"), QStringLiteral("You must Select a file from the list"));
+    if (listSdFiles->currentRow() < 0) {
+        QMessageBox::information(this, tr("Print Error"), tr("You must Select a file from the list"));
     } else  {
-        core->print(ui->sdFileListView->currentItem()->text(), true);
+        core->print(listSdFiles->currentItem()->text(), true);
     }
 }
 
 void MainWindow::sdDelPBClicked()
 {
-    if (ui->sdFileListView->currentRow() < 0) {
-        QMessageBox::information(this, QStringLiteral("Delete Error"), QStringLiteral("You must Select a file from the list"));
+    if (listSdFiles->currentRow() < 0) {
+        QMessageBox::information(this, tr("Delete Error"), tr("You must Select a file from the list"));
     } else  {
-        core->sdDelete(ui->sdFileListView->currentItem()->text());
-        ui->sdFileListView->setCurrentRow(-1);
+        core->sdDelete(listSdFiles->currentItem()->text());
+        listSdFiles->setCurrentRow(-1);
     }
 }
diff --git a/testclient/mainwindow.h b/testclient/mainwindow.h
index 18c5cf4..080ceb7 100644
--- a/testclient/mainwindow.h
+++ b/testclient/mainwindow.h
@@ -1,291 +1,360 @@
 /* AtCore Test Client
     Copyright (C) <2016>
 
     Authors:
         Patrick José Pereira <patrickelectric@gmail.com>
         Lays Rodrigues <laysrodrigues@gmail.com>
         Chris Rizzitello <rizzitello@kde.org>
         Tomaz Canabrava <tcanabrava@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/>.
 */
 #pragma once
 
 #include <QTemporaryFile>
 #include <QMainWindow>
 #include <QSerialPort>
 
-#include "ui_mainwindow.h"
 #include "atcore.h"
+#include "widgets/plotwidget.h"
 
 class SerialLayer;
 
 class  MainWindow: public QMainWindow
 {
     Q_OBJECT
 
 public:
     explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow() override;
 
 public slots:
     /**
      * @brief Check received messages
      *
      */
     void checkReceivedCommand(const QByteArray &message);
 
     /**
      * @brief Check pushed message
      *
      * @param  bmsg : Message
      */
     void checkPushedCommands(QByteArray);
 
     /**
      * @brief Check temperature
      *
      * @param  sensorType : type of sensor
      * @param  number     : index of sensor
      * @param  temp       : temperature
      */
     void checkTemperature(uint sensorType, uint number, uint temp);
 
 private slots:
     //ButtonEvents
     /**
      * @brief axisControlClicked Used to catch the axis control.
      * @param axis The Axis clicked on (X |Y |Z)
      * @param value Distance Value
      */
     void axisControlClicked(QLatin1Char axis, int value);
     /**
      * @brief the printing progress has changed
      * @param progress: the new progress
      */
     void printProgressChanged(int progress);
 
     /**
      * @brief Connect Button Clicked will connect or disconnect based on printer state
      */
     void connectPBClicked();
 
     /**
      * @brief Send Command Clicked
      */
     void sendPBClicked();
 
     /**
      * @brief Home All Clicked
      */
     void homeAllPBClicked();
 
     /**
      * @brief Home X Axis Clicked
      */
     void homeXPBClicked();
 
     /**
      * @brief Home Y Axis Clicked
      */
     void homeYPBClicked();
 
     /**
      * @brief Home Z Axis Clicked
      */
     void homeZPBClicked();
 
     /**
      * @brief Set Bed Temp Clicked
      */
     void bedTempPBClicked();
 
     /**
      * @brief Set Extruder Temp Clicked
      */
     void extTempPBClicked();
 
     /**
      * @brief Move Axis Clicked
      */
     void mvAxisPBClicked();
 
     /**
      * @brief Set Fan Speed Clicked
      */
     void fanSpeedPBClicked();
 
     /**
      * @brief Print Button Clicked, can also pause /resue print based on printer state
      */
     void printPBClicked();
 
     /**
      * @brief Print Button for Sd Prints clicked.
      */
     void sdPrintPBClicked();
     /**
      * @brief Save the log file.
      */
     void saveLogPBClicked();
 
     /**
      * @brief  set printer speed clicked
      */
     void printerSpeedPBClicked();
 
     /**
      * @brief lowRatePB has been clicked
      */
     void flowRatePBClicked();
 
     /**
      * @brief disableMotorsPB has been clicked
      */
     void disableMotorsPBClicked();
 
     /**
      * @brief printerStateChanged Catch and proccess printer state commands
      * @param state: new printer state
      */
     void printerStateChanged(AtCore::STATES state);
 
     /**
      * @brief showMessage show a message on the printers LCD
      */
     void showMessage();
 
     /**
      * @brief Update the print Time
      */
     void updatePrintTime();
 
     /**
      * @brief show/hide dock titlebars
+     * @param checked: True if shown
      */
-    void toggleDockTitles();
+    void toggleDockTitles(bool checked);
 
     /**
      * @brief Toggle disable state of dangerous docks
      * Command, Sd Card, Movement, Temperature Controls and Printing docks
      * @param disabled: True if items are disabled.
      */
     void setDangeriousDocksDisabled(bool disabled);
-    /**
-     * @brief Show the about dialog
-     */
-    void about();
 
     /**
      * @brief List Files on the sd card.
      */
     void getSdList();
 
     /**
      * @brief Sd Card Delete file clicked
      */
     void sdDelPBClicked();
 
 private:
-    Ui::MainWindow *ui;
     AtCore *core;
     QTemporaryFile *logFile;
     QTime *printTime;
     QTimer *printTimer;
     // Define max number of fans
     static int fanCount;
 
     void closeEvent(QCloseEvent *event) override;
     /**
      * @brief Locate serial port
      *
      */
     void locateSerialPort(const QStringList &ports);
 
     /**
      * @brief Return string with actual time
      *
      * @return QString
      */
     QString getTime();
 
     /**
      * @brief Append text in temporary file
      *
      * @param text
      */
     void writeTempFile(QString text);
 
     /**
      * @brief Normal header
      *
      * @return QString
      */
     QString logHeader();
 
     /**
      * @brief Header of type received
      *
      * @return QString
      */
     QString rLogHeader();
 
     /**
      * @brief Header of type send
      *
      * @return QString
      */
     QString sLogHeader();
 
     /**
      * @brief Add in logger normal type message
      *
      * @param  msg: Message
      */
     void addLog(QString msg);
 
     /**
      * @brief Add in logger received type message
      *
      * @param  msg: Message
      */
     void addRLog(QString msg);
 
     /**
      * @brief Add in logger send type message
      *
      * @param  msg: Message
      */
     void addSLog(QString msg);
 
     /**
      * @brief pluginCB index changed
      */
     void pluginCBChanged(QString currentText);
 
     /**
      * @brief setupActions for KXMLGui
      */
     void setupActions();
 
     /**
      * @brief Populate comboboxes
      */
     void populateCBs();
 
     /**
      * @brief Gui Changes for when sd card mount status has changed.
      */
     void sdChanged(bool mounted);
+
+    //UI Functions
+
+    /**
+     * @brief Create The Menubar
+     */
+    void initMenu();
+
+    /**
+     * @brief Create StatusBar
+     */
+    void initStatusBar();
+
+    /**
+     * @brief Create Main Widgets.
+     */
+    void initWidgets();
+
+//Private GUI Items
+    //menuView is global to allow for docks to be added / removed.
+    QMenu *menuView = nullptr;
+    //Status Bar Items
+    QLabel *lblState = nullptr;
+    QLabel *lblSd = nullptr;
+    QWidget *printProgressWidget = nullptr;
+    QProgressBar *printingProgress = nullptr;
+    QLabel *lblTime = nullptr;
+    QLabel *lblTimeLeft = nullptr;
+    //Docks
+    void makeLogDock();
+    QDockWidget *logDock = nullptr;
+    QPlainTextEdit *textLog = nullptr;
+
+    void makeTempTimelineDock();
+    QDockWidget *tempTimelineDock = nullptr;
+    PlotWidget *plotWidget = nullptr;
+
+    void makeCommandDock();
+    QDockWidget *printDock = nullptr;
+    QDockWidget *commandDock = nullptr;
+    QLineEdit *lineCommand = nullptr;
+    QLineEdit *lineMessage = nullptr;
+
+    void makePrintDock();
+    QPushButton *buttonPrint = nullptr;
+    QLineEdit *linePostPause = nullptr;
+    QSpinBox *sbFlowRate = nullptr;
+    QSpinBox *sbPrintSpeed = nullptr;
+
+    void makeConnectDock();
+    QDockWidget *connectDock = nullptr;
+    QComboBox *comboPort = nullptr;
+    QComboBox *comboBAUD = nullptr;
+    QComboBox *comboPlugin = nullptr;
+    QPushButton *buttonConnect = nullptr;
+
+    void makeMoveDock();
+    QDockWidget *moveDock = nullptr;
+    QComboBox *comboMoveAxis = nullptr;
+    QDoubleSpinBox *sbMoveAxis = nullptr;
+
+    void makeTempControlsDock();
+    QDockWidget *tempControlsDock = nullptr;
+    QCheckBox *checkAndWait = nullptr;
+    QSpinBox *sbBedTemp = nullptr;
+    QComboBox *comboExtruderSelect;
+    QSpinBox *sbExtruderTemp;
+    QComboBox *comboFanSelect;
+    QSpinBox *sbFanSpeed;
+
+    void makeSdDock();
+    QDockWidget *sdDock = nullptr;
+    QListWidget *listSdFiles = nullptr;
 };
diff --git a/testclient/mainwindow.ui b/testclient/mainwindow.ui
deleted file mode 100644
index 993a8e4..0000000
--- a/testclient/mainwindow.ui
+++ /dev/null
@@ -1,1054 +0,0 @@
-<?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>0</width>
-    <height>0</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>AtCore - Test Client</string>
-  </property>
-  <widget class="QWidget" name="centralwidget">
-   <widget class="QWidget" name="statusBarWidget" native="true">
-    <property name="geometry">
-     <rect>
-      <x>6</x>
-      <y>418</y>
-      <width>801</width>
-      <height>46</height>
-     </rect>
-    </property>
-    <property name="sizePolicy">
-     <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-      <horstretch>100</horstretch>
-      <verstretch>0</verstretch>
-     </sizepolicy>
-    </property>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <property name="topMargin">
-      <number>0</number>
-     </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <property name="bottomMargin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QLabel" name="label_9">
-       <property name="text">
-        <string>AtCoreState:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="lblState">
-       <property name="text">
-        <string>Not Connected</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Fixed</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>10</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QFrame" name="frame">
-       <property name="frameShape">
-        <enum>QFrame::StyledPanel</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Raised</enum>
-       </property>
-       <layout class="QHBoxLayout" name="horizontalLayout_14">
-        <item>
-         <widget class="QLabel" name="lbl_sd">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QFrame" name="printLayout">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="frameShape">
-        <enum>QFrame::StyledPanel</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Raised</enum>
-       </property>
-       <layout class="QHBoxLayout" name="horizontalLayout_16">
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
-         <number>0</number>
-        </property>
-        <item>
-         <widget class="QProgressBar" name="printingProgress">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="value">
-           <number>0</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="stopPB">
-          <property name="toolTip">
-           <string>Stop Print Job</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset theme="process-stop">
-            <normaloff>.</normaloff>.</iconset>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="time">
-          <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Elapsed Time&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-          </property>
-          <property name="text">
-           <string>00:00:00</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="label_10">
-          <property name="text">
-           <string>/</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="timeLeft">
-          <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remaining Time&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-          </property>
-          <property name="text">
-           <string>00:00:00</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-   <widget class="QDockWidget" name="printDock">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>0</y>
-      <width>473</width>
-      <height>243</height>
-     </rect>
-    </property>
-    <property name="minimumSize">
-     <size>
-      <width>0</width>
-      <height>0</height>
-     </size>
-    </property>
-    <property name="windowTitle">
-     <string>&amp;Print</string>
-    </property>
-    <widget class="QWidget" name="dockWidgetContents_7">
-     <layout class="QVBoxLayout" name="verticalLayout_10">
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_10">
-        <item>
-         <widget class="QPushButton" name="printPB">
-          <property name="text">
-           <string>Print File</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="emergencyStopPB">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Emergency Stop</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_15">
-        <item>
-         <widget class="QLabel" name="label_8">
-          <property name="text">
-           <string>On Pause:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="postPauseLE">
-          <property name="placeholderText">
-           <string>G91,G0 Z1,G90,G1 X0 Y195</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_12">
-        <item>
-         <widget class="QLabel" name="label_6">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Printer Speed</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="printerSpeedSB">
-          <property name="suffix">
-           <string notr="true">%</string>
-          </property>
-          <property name="prefix">
-           <string/>
-          </property>
-          <property name="maximum">
-           <number>300</number>
-          </property>
-          <property name="value">
-           <number>100</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="printerSpeedPB">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Set</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_13">
-        <item>
-         <widget class="QLabel" name="label_7">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Flow Rate</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="flowRateSB">
-          <property name="suffix">
-           <string>%</string>
-          </property>
-          <property name="maximum">
-           <number>300</number>
-          </property>
-          <property name="value">
-           <number>100</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="flowRatePB">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Set</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </widget>
-   <widget class="QDockWidget" name="commandDock">
-    <property name="geometry">
-     <rect>
-      <x>0</x>
-      <y>240</y>
-      <width>485</width>
-      <height>146</height>
-     </rect>
-    </property>
-    <property name="minimumSize">
-     <size>
-      <width>0</width>
-      <height>0</height>
-     </size>
-    </property>
-    <property name="windowTitle">
-     <string>Comma&amp;nds</string>
-    </property>
-    <widget class="QWidget" name="dockWidgetContents">
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QLineEdit" name="commandLE">
-          <property name="placeholderText">
-           <string>Send Command</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="sendPB">
-          <property name="text">
-           <string>Send</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_17">
-        <item>
-         <widget class="QLineEdit" name="messageLE">
-          <property name="placeholderText">
-           <string>Show Message</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="showMessagePB">
-          <property name="text">
-           <string>Send</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </widget>
-   <widget class="QDockWidget" name="sdDock">
-    <property name="geometry">
-     <rect>
-      <x>0</x>
-      <y>42</y>
-      <width>515</width>
-      <height>317</height>
-     </rect>
-    </property>
-    <property name="windowTitle">
-     <string>S&amp;d Card</string>
-    </property>
-    <widget class="QWidget" name="dockWidgetContents_5">
-     <layout class="QVBoxLayout" name="verticalLayout_3">
-      <item>
-       <widget class="QFrame" name="frame_2">
-        <property name="frameShape">
-         <enum>QFrame::StyledPanel</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Raised</enum>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_18">
-         <item>
-          <widget class="QPushButton" name="sdListPB">
-           <property name="text">
-            <string>Get List</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="sdPrintPB">
-           <property name="text">
-            <string>Print Selected</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="sdDelPB">
-           <property name="text">
-            <string>Delete Selected</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <widget class="QGroupBox" name="groupBox_3">
-        <property name="title">
-         <string>Files On Sd Card.</string>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_11">
-         <item>
-          <widget class="QListWidget" name="sdFileListView"/>
-         </item>
-        </layout>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </widget>
-  </widget>
-  <widget class="QDockWidget" name="tempTimelineDock">
-   <property name="minimumSize">
-    <size>
-     <width>0</width>
-     <height>0</height>
-    </size>
-   </property>
-   <property name="windowTitle">
-    <string>Temperat&amp;ure Timeline</string>
-   </property>
-   <attribute name="dockWidgetArea">
-    <number>2</number>
-   </attribute>
-   <widget class="QWidget" name="dockWidgetContents_2">
-    <layout class="QVBoxLayout" name="verticalLayout_5">
-     <item>
-      <widget class="PlotWidget" name="plotWidget" native="true">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>0</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-  </widget>
-  <widget class="QDockWidget" name="connectDock">
-   <property name="minimumSize">
-    <size>
-     <width>0</width>
-     <height>0</height>
-    </size>
-   </property>
-   <property name="windowTitle">
-    <string>&amp;Connection Settings</string>
-   </property>
-   <attribute name="dockWidgetArea">
-    <number>1</number>
-   </attribute>
-   <widget class="QWidget" name="dockWidgetContents_3">
-    <layout class="QVBoxLayout" name="verticalLayout_6">
-     <item>
-      <widget class="QGroupBox" name="groupBox_2">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="title">
-        <string/>
-       </property>
-       <layout class="QVBoxLayout" name="verticalLayout_9">
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
-         <number>0</number>
-        </property>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_8">
-          <item>
-           <widget class="QLabel" name="label_2">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Port:</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="serialPortCB"/>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_9">
-          <item>
-           <widget class="QLabel" name="label_3">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Baud Rate:</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="baudRateLE">
-            <property name="editable">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_11">
-          <item>
-           <widget class="QLabel" name="label_4">
-            <property name="text">
-             <string>Use Plugin</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="pluginCB">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <widget class="QPushButton" name="connectPB">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Connect</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-  </widget>
-  <widget class="QDockWidget" name="logDock">
-   <property name="minimumSize">
-    <size>
-     <width>0</width>
-     <height>0</height>
-    </size>
-   </property>
-   <property name="windowTitle">
-    <string>Session &amp;Log</string>
-   </property>
-   <attribute name="dockWidgetArea">
-    <number>2</number>
-   </attribute>
-   <widget class="QWidget" name="dockWidgetContents_4">
-    <layout class="QVBoxLayout" name="verticalLayout_8">
-     <item>
-      <widget class="QGroupBox" name="groupBox">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="title">
-        <string/>
-       </property>
-       <layout class="QVBoxLayout" name="verticalLayout_4">
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
-         <number>0</number>
-        </property>
-        <item>
-         <widget class="QPlainTextEdit" name="logTE">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="readOnly">
-           <bool>true</bool>
-          </property>
-          <property name="maximumBlockCount">
-           <number>1000</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="saveLogPB">
-          <property name="text">
-           <string>Save Session Log</string>
-          </property>
-          <property name="icon">
-           <iconset theme="document-save">
-            <normaloff>.</normaloff>.</iconset>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-  </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="moveDock">
-   <property name="minimumSize">
-    <size>
-     <width>0</width>
-     <height>0</height>
-    </size>
-   </property>
-   <property name="windowTitle">
-    <string>&amp;Movement</string>
-   </property>
-   <attribute name="dockWidgetArea">
-    <number>1</number>
-   </attribute>
-   <widget class="QWidget" name="moveDockContents">
-    <layout class="QVBoxLayout" name="verticalLayout_2">
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_3">
-       <item>
-        <widget class="QPushButton" name="homeAllPB">
-         <property name="text">
-          <string>Home All</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="homeXPB">
-         <property name="text">
-          <string>Home X</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="homeYPB">
-         <property name="text">
-          <string>Home Y</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="homeZPB">
-         <property name="text">
-          <string>Home Z</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_6">
-       <item>
-        <widget class="QComboBox" name="mvAxisCB">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <item>
-          <property name="text">
-           <string>Move X Axis to</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Move Y Axis to</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Move Z Axis to</string>
-          </property>
-         </item>
-        </widget>
-       </item>
-       <item>
-        <widget class="QDoubleSpinBox" name="mvAxisSB">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-         <property name="decimals">
-          <number>0</number>
-         </property>
-         <property name="maximum">
-          <double>200.000000000000000</double>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="mvAxisPB">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Go</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="QPushButton" name="disableMotorsPB">
-       <property name="text">
-        <string>Disable Motors</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-  </widget>
-  <widget class="QDockWidget" name="tempControlsDock">
-   <property name="minimumSize">
-    <size>
-     <width>0</width>
-     <height>0</height>
-    </size>
-   </property>
-   <property name="windowTitle">
-    <string>&amp;Temperatures</string>
-   </property>
-   <attribute name="dockWidgetArea">
-    <number>1</number>
-   </attribute>
-   <widget class="QWidget" name="dockWidgetContents_6">
-    <layout class="QVBoxLayout" name="verticalLayout_7">
-     <item>
-      <widget class="QCheckBox" name="cb_andWait">
-       <property name="text">
-        <string> Wait Untill Temperature Stablizes</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_4">
-       <item>
-        <widget class="QLabel" name="label_5">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Bed Temp</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QDoubleSpinBox" name="bedTempSB">
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-         <property name="suffix">
-          <string>°C</string>
-         </property>
-         <property name="decimals">
-          <number>0</number>
-         </property>
-         <property name="maximum">
-          <double>100.000000000000000</double>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="bedTempPB">
-         <property name="text">
-          <string>Set</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_5">
-       <item>
-        <widget class="QComboBox" name="extTempSelCB">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QDoubleSpinBox" name="extTempSB">
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-         <property name="suffix">
-          <string>°C</string>
-         </property>
-         <property name="decimals">
-          <number>0</number>
-         </property>
-         <property name="maximum">
-          <double>275.000000000000000</double>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="extTempPB">
-         <property name="text">
-          <string>Set</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_7">
-       <item>
-        <widget class="QComboBox" name="fanSpeedSelCB">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QSpinBox" name="fanSpeedSB">
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-         <property name="suffix">
-          <string>%</string>
-         </property>
-         <property name="maximum">
-          <number>100</number>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="fanSpeedPB">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Set</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </widget>
-  </widget>
-  <widget class="QMenuBar" name="menuBar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>767</width>
-     <height>37</height>
-    </rect>
-   </property>
-   <widget class="QMenu" name="menuFile">
-    <property name="title">
-     <string>&amp;File</string>
-    </property>
-    <addaction name="actionQuit"/>
-   </widget>
-   <widget class="QMenu" name="menuView">
-    <property name="title">
-     <string>&amp;View</string>
-    </property>
-    <addaction name="actionShowDockTitles"/>
-    <addaction name="separator"/>
-   </widget>
-   <widget class="QMenu" name="menuHelp">
-    <property name="title">
-     <string>&amp;Help</string>
-    </property>
-    <addaction name="actionAbout"/>
-   </widget>
-   <addaction name="menuFile"/>
-   <addaction name="menuView"/>
-   <addaction name="menuHelp"/>
-  </widget>
-  <action name="actionQuit">
-   <property name="text">
-    <string>&amp;Quit</string>
-   </property>
-  </action>
-  <action name="actionShowDockTitles">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="checked">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>&amp;Show Dock Titles</string>
-   </property>
-  </action>
-  <action name="actionAbout">
-   <property name="text">
-    <string>&amp;About</string>
-   </property>
-   <property name="shortcut">
-    <string notr="true">F1</string>
-   </property>
-  </action>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>PlotWidget</class>
-   <extends>QWidget</extends>
-   <header location="global">plotwidget.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>