diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 8bf9095..69b4a33 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1,493 +1,494 @@
 /* Atelier KDE Printer Host for 3D Printing
     Copyright (C) <2016>
     Author: Lays Rodrigues - lays.rodrigues@kde.org
             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 <KActionCollection>
 #include <KLocalizedString>
 #include <KStandardAction>
 #include <KXMLGUIFactory>
 #include <memory>
 #include <QFileDialog>
 #include <QHBoxLayout>
 #include <QSplitter>
 #include <QToolButton>
 #include "dialogs/choosefiledialog.h"
 #include "dialogs/profilesdialog.h"
 #include "mainwindow.h"
 #include "widgets/3dview/viewer3d.h"
 #include "widgets/atcoreinstancewidget.h"
 #include "widgets/videomonitorwidget.h"
 #include "widgets/welcomewidget.h"
 
 MainWindow::MainWindow(QWidget *parent) :
     KXmlGuiWindow(parent)
     , m_currEditorView(nullptr)
     , m_currInstance(0)
     , m_theme(getTheme())
     , m_instances(new QTabWidget(this))
 {
     initWidgets();
     setupActions();
     setAcceptDrops(true);
 
     connect(m_instances, &QTabWidget::tabCloseRequested, this, [this](int index) {
         auto tempWidget = qobject_cast<AtCoreInstanceWidget *>(m_instances->widget(index));
         if (tempWidget->isPrinting()) {
             if (askToClose()) {
                 delete tempWidget;
             } else {
                 return;
             }
         } else {
             delete tempWidget;
         }
         if (m_instances->count() == 1) {
             m_instances->setTabsClosable(false);
             m_instances->setMovable(false);
         }
     });
 }
 
 void MainWindow::closeEvent(QCloseEvent *event)
 {
     if (!askToSave(m_gcodeEditor->modifiedFiles())) {
         event->ignore();
     }
 
     bool closePrompt = false;
     for (int i = 0; i < m_instances->count(); i++) {
         AtCoreInstanceWidget *instance = qobject_cast<AtCoreInstanceWidget *>(m_instances->widget(i));
         if (instance->isPrinting()) {
             closePrompt = true;
             break;
         }
     }
     if (closePrompt) {
         if (askToClose()) {
             event->accept();
         } else {
             event->ignore();
         }
     }
 }
 
 void MainWindow::dragEnterEvent(QDragEnterEvent *event)
 {
     event->accept();
 }
 
 void MainWindow::dropEvent(QDropEvent *event)
 {
     const QMimeData *mimeData = event->mimeData();
     if (mimeData->hasUrls()) {
         processDropEvent(mimeData->urls());
     }
 }
 
 void MainWindow::processDropEvent(const QList<QUrl> &fileList)
 {
     for (const auto &url : fileList) {
         //Loop thru the urls and only load ones ending our "supported" formats
         QString ext = url.toLocalFile().split('.').last();
         if (ext.contains("gcode", Qt::CaseInsensitive)
                 || ext.contains("gco", Qt::CaseInsensitive)) {
             loadFile(url);
         }
     }
 }
 
 void MainWindow::initWidgets()
 {
     setupLateralArea();
     newAtCoreInstance();
     // View:
     // Sidebar, Sidebar Controls, Printer Tabs.
     // Sidebar Controls and Printer Tabs can be resized, Sidebar can't.
     auto splitter = new QSplitter();
     splitter->addWidget(m_lateral.m_stack);
     splitter->addWidget(m_instances);
 
     auto addTabBtn = new QToolButton();
     addTabBtn->setIconSize(QSize(fontMetrics().lineSpacing(), fontMetrics().lineSpacing()));
     addTabBtn->setIcon(QIcon::fromTheme("list-add", QIcon(QString(":/%1/addTab").arg(m_theme))));
     addTabBtn->setToolTip(i18n("Create new instance"));
     addTabBtn->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_T));
     connect(addTabBtn, &QToolButton::clicked, this, &MainWindow::newAtCoreInstance);
     m_instances->setCornerWidget(addTabBtn, Qt::TopLeftCorner);
 
     auto *centralLayout = new QHBoxLayout();
     centralLayout->addWidget(m_lateral.m_toolBar);
     centralLayout->addWidget(splitter);
 
     auto *centralWidget = new QWidget();
     centralWidget->setLayout(centralLayout);
     setCentralWidget(centralWidget);
 }
 
 void MainWindow::newAtCoreInstance()
 {
     auto newInstanceWidget = new AtCoreInstanceWidget(this);
     QString name = QString::number(m_instances->addTab(newInstanceWidget, i18n("Connect a printer")));
     newInstanceWidget->setObjectName(name);
     newInstanceWidget->setFileCount(m_openFiles.size());
     connect(this, &MainWindow::profilesChanged, newInstanceWidget, &AtCoreInstanceWidget::updateProfileData);
     connect(newInstanceWidget, &AtCoreInstanceWidget::requestProfileDialog, this, [this] {
         std::unique_ptr<ProfilesDialog> pd(new ProfilesDialog);
         pd->exec();
         emit(profilesChanged());
     });
 
     connect(newInstanceWidget, &AtCoreInstanceWidget::requestFileChooser, this, [newInstanceWidget, this] {
         QUrl file;
         switch (m_openFiles.size())
         {
         case 0:
             QMessageBox::warning(this, i18n("Error"),
                                  i18n("There's no GCode File open. \n Please select a file and try again."),
                                  QMessageBox::Ok);
             break;
         case 1:
             file = m_openFiles.at(0);
             break;
         default:
             ChooseFileDialog dialog(this, m_openFiles);
             if (dialog.exec() == QDialog::Accepted) {
                 file = dialog.choosenFile();
             }
             break;
         }
         if (m_gcodeEditor->modifiedFiles().contains(file))
         {
             int result = QMessageBox::question(
                              this
                              , i18n("Document Modified")
                              , i18n("%1 \n Contains Unsaved Changes That will not be in the print.\n Would you like to Save before printing?", file.toLocalFile())
                              , QMessageBox::Save
                              , QMessageBox::Cancel
                              , QMessageBox::Ignore
                          );
             if (result == QMessageBox::Cancel) {
                 return;
             } else if (result == QMessageBox::Save) {
                 m_gcodeEditor->saveFile(file);
             }
         }
         newInstanceWidget->printFile(file);
     });
 
     connect(newInstanceWidget, &AtCoreInstanceWidget::bedSizeChanged, this, [this](const QSize & newSize) {
         if (m_currInstance == m_instances->currentIndex()) {
             updateBedSize(newSize);
         }
     });
 
     connect(newInstanceWidget, &AtCoreInstanceWidget::connectionChanged, this, &MainWindow::atCoreInstanceNameChange);
 
     if (m_instances->count() > 1) {
         m_instances->setTabsClosable(true);
         m_instances->setMovable(true);
         m_instances->setCurrentIndex(m_instances->count() - 1);
     }
 }
 // Move to LateralArea.
 void MainWindow::setupLateralArea()
 {
     m_lateral.m_toolBar = new QWidget();
     m_lateral.m_stack = new QStackedWidget();
     auto buttonLayout = new QVBoxLayout();
 
     auto setupButton = [this, buttonLayout](const QString & key, const QString & text, const QIcon & icon, QWidget * w) {
         auto *btn = new QPushButton(m_lateral.m_toolBar);
         btn->setToolTip(text);
         btn->setAutoExclusive(true);
         btn->setCheckable(true);
-        //3d view is on top set it checked so users see its selected.
+        //Check the top most widget, so users see its selected at startup time.
         btn->setChecked(key == QStringLiteral("welcome"));
         btn->setIcon(icon);
         //Set an iconSize based on the DPI.
         //96 was considered to be the "standard" DPI for years.
-        //Hi-dpi monitors have a higher DPI
+        //Hi-dpi monitors have a higher DPI; 150+
         //Tiny or old screen could have a lower DPI.
-        //Start our iconSize at 16 so with a DPI less then 96 we get a sane iconsize.
-        int iconSize = 16 + ((logicalDpiX() / 96) * 16);
+        //Start our iconSize at 16 so with a low DPI we get a sane iconsize.
+        //Use 72 to better scale for less dense Hi-Dpi screens
+        int iconSize = 16 + ((logicalDpiX() / 72) * 16);
         btn->setIconSize(QSize(iconSize, iconSize));
         btn->setFixedSize(btn->iconSize());
         btn->setFlat(true);
         m_lateral.m_stack->addWidget(w);
         m_lateral.m_map[key] = {btn, w};
         buttonLayout->addWidget(btn);
 
         connect(btn, &QPushButton::clicked, this, [this, w, btn] {
             if (m_lateral.m_stack->currentWidget() == w)
             {
                 m_lateral.m_stack->setHidden(m_lateral.m_stack->isVisible());
                 if (m_lateral.m_stack->isHidden()) {
                     btn->setCheckable(false);
                     btn->setCheckable(true);
                 }
             } else
             {
                 m_lateral.m_stack->setHidden(false);
                 m_lateral.m_stack->setCurrentWidget(w);
             }
             toggleGCodeActions();
         });
     };
 
     m_gcodeEditor = new GCodeEditorWidget(this);
     connect(m_gcodeEditor, &GCodeEditorWidget::updateClientFactory, this, &MainWindow::updateClientFactory);
     connect(m_gcodeEditor, &GCodeEditorWidget::droppedUrls, this, &MainWindow::processDropEvent);
     connect(m_gcodeEditor, &GCodeEditorWidget::fileClosed, this, [this](const QUrl & file) {
         m_openFiles.removeAll(file);
     });
 
     auto *viewer3D = new Viewer3D(this);
     connect(viewer3D, &Viewer3D::droppedUrls, this, &MainWindow::processDropEvent);
     //Connect for bed size
     connect(m_instances, &QTabWidget::currentChanged, this, [this](int index) {
         m_currInstance = index;
         auto tempWidget = qobject_cast<AtCoreInstanceWidget *>(m_instances->widget(index));
         updateBedSize(tempWidget->bedSize());
     });
 
     connect(m_gcodeEditor, &GCodeEditorWidget::currentFileChanged, this, [viewer3D](const QUrl & url) {
         viewer3D->drawModel(url.toLocalFile());
     });
 
     setupButton("welcome", i18n("Welcome"), QIcon::fromTheme("go-home", QIcon(QString(":/%1/home").arg(m_theme))), new WelcomeWidget(this));
     setupButton("3d", i18n("3D"), QIcon::fromTheme("draw-cuboid", QIcon(QString(":/%1/3d").arg(m_theme))), viewer3D);
     setupButton("gcode", i18n("GCode"), QIcon::fromTheme("accessories-text-editor", QIcon(":/icon/edit")), m_gcodeEditor);
     setupButton("video", i18n("Video"), QIcon::fromTheme("camera-web", QIcon(":/icon/video")), new VideoMonitorWidget(this));
     buttonLayout->addStretch();
     m_lateral.m_toolBar->setLayout(buttonLayout);
 }
 
 void MainWindow::setupActions()
 {
     // Actions for the Toolbar
     QAction *action;
     action = actionCollection()->addAction(QStringLiteral("open"));
     action->setIcon(QIcon::fromTheme("document-open", QIcon(QString(":/%1/open").arg(m_theme))));
 
     action->setText(i18n("&Open"));
     actionCollection()->setDefaultShortcut(action, QKeySequence::Open);
     connect(action, &QAction::triggered, this, &MainWindow::openActionTriggered);
 
     action = actionCollection()->addAction(QStringLiteral("new_instance"));
     action->setIcon(QIcon::fromTheme("list-add", QIcon(QString(":/%1/addTab").arg(m_theme))));
 
     action->setText(i18n("&New Connection"));
     actionCollection()->setDefaultShortcut(action, QKeySequence::AddTab);
     connect(action, &QAction::triggered, this, &MainWindow::newAtCoreInstance);
 
     action = actionCollection()->addAction(QStringLiteral("profiles"));
     action->setIcon(QIcon::fromTheme("document-properties", QIcon(QString(":/%1/configure").arg(m_theme))));
 
     action->setText(i18n("&Profiles"));
     connect(action, &QAction::triggered, this, [this] {
         std::unique_ptr<ProfilesDialog> pd(new ProfilesDialog);
         pd->exec();
         emit(profilesChanged());
     });
 
     action = actionCollection()->addAction(QStringLiteral("quit"));
     action->setIcon(QIcon::fromTheme("application-exit", QIcon(":/icon/exit")));
 
     action->setText(i18n("&Quit"));
     actionCollection()->setDefaultShortcut(action, QKeySequence::Quit);
     connect(action, &QAction::triggered, this, &MainWindow::close);
 
     setupGUI(Default, "atelierui");
 }
 
 void MainWindow::openActionTriggered()
 {
     QList<QUrl> fileList = QFileDialog::getOpenFileUrls(
                                this
                                , i18n("Open GCode")
                                , QUrl::fromLocalFile(QDir::homePath())
                                , i18n("GCode(*.gco *.gcode);;All Files(*.*)")
                            );
     for (const auto &url : fileList) {
         loadFile(url);
     }
 }
 
 void MainWindow::loadFile(const QUrl &fileName)
 {
     if (!fileName.isEmpty()) {
 
         m_lateral.get<GCodeEditorWidget>("gcode")->loadFile(fileName);
         m_lateral.get<Viewer3D>("3d")->drawModel(fileName.toLocalFile());
         // Make 3dview focused when opening a file
         if (m_openFiles.isEmpty() && m_lateral.m_stack->currentWidget() == m_lateral.get<WelcomeWidget>("welcome")) {
             m_lateral.getButton<QPushButton>("3d")->setChecked(true);
             m_lateral.m_stack->setCurrentWidget(m_lateral.get<Viewer3D>("3d"));
         }
 
         const int tabs = m_instances->count();
         if (!m_openFiles.contains(fileName)) {
             m_openFiles.append(fileName);
         }
 
         for (int i = 0; i < tabs; ++i) {
             auto instance = qobject_cast<AtCoreInstanceWidget *>(m_instances->widget(i));
             instance->setFileCount(m_openFiles.size());
         }
     }
 }
 
 void MainWindow::atCoreInstanceNameChange(const QString &name)
 {
     m_instances->setTabText(sender()->objectName().toInt(), name);
 }
 
 QString MainWindow::getTheme()
 {
     return palette().text().color().value() >= QColor(Qt::lightGray).value() ? \
            QString("dark") : QString("light");
 }
 
 bool MainWindow::askToClose()
 {
     bool rtn = false;
     int result = QMessageBox::question(
                      this
                      , i18n("Printing")
                      , i18n("Currently printing! \nAre you sure you want to close?")
                      , QMessageBox::Close
                      , QMessageBox::Cancel
                  );
 
     switch (result) {
     case QMessageBox::Close:
         rtn = true;
         break;
     default:
         break;
     }
     return rtn;
 }
 
 void MainWindow::toggleGCodeActions()
 {
     if (m_lateral.m_stack->currentWidget() == m_lateral.m_map["gcode"].second && m_lateral.m_stack->isVisible()) {
         if (m_currEditorView) {
             guiFactory()->addClient(m_currEditorView);
         }
     } else {
         guiFactory()->removeClient(m_currEditorView);
     }
 }
 
 void MainWindow::updateClientFactory(KTextEditor::View *view)
 {
     if (m_lateral.m_stack->currentWidget() == m_lateral.m_map["gcode"].second) {
         if (m_currEditorView) {
             guiFactory()->removeClient(m_currEditorView);
         }
         if (view) {
             guiFactory()->addClient(view);
         }
     }
     m_currEditorView = view;
 }
 
 bool MainWindow::askToSave(const QVector<QUrl> &fileList)
 {
 
     if (fileList.isEmpty()) {
         return true;
     }
     QSize iconSize = QSize(fontMetrics().lineSpacing(), fontMetrics().lineSpacing());
     auto dialog = new QDialog();
     const int padding = 30;
     auto listWidget = new QListWidget();
     listWidget->setMinimumWidth(fontMetrics().height() / 2  * padding);
     for (const auto &url : fileList) {
         listWidget->addItem(url.toLocalFile() + " [*]");
     }
 
     auto hLayout = new QHBoxLayout();
     auto saveBtn = new QPushButton(QIcon::fromTheme("document-save", QIcon(QStringLiteral(":/%1/save").arg(m_theme))), i18n("Save Selected"));
     saveBtn->setIconSize(iconSize);
     connect(saveBtn, &QPushButton::clicked, this, [this, &listWidget, &fileList, &dialog] {
         if (!m_gcodeEditor->saveFile(fileList.at(listWidget->currentRow())))
         {
             QMessageBox::information(this, i18n("Save Failed"), i18n("Failed to save file: %1").arg(fileList.at(listWidget->currentRow()).toLocalFile()));
         } else
         {
             QString txt = listWidget->item(listWidget->currentRow())->text();
             txt.remove(" [*]");
             listWidget->item(listWidget->currentRow())->setText(txt);
             for (int i = 0; i < listWidget->count(); i++) {
                 QString string = listWidget->item(i)->text();
                 if (string.endsWith(" [*]")) {
                     return;
                 }
             }
             dialog->accept();
         }
     });
     hLayout->addWidget(saveBtn);
 
     auto saveAllBtn = new QPushButton(QIcon::fromTheme("document-save-all", QIcon(QStringLiteral(":/%1/saveAll").arg(m_theme))), i18n("Save All"));
     saveAllBtn->setIconSize(iconSize);
     connect(saveAllBtn, &QPushButton::clicked, this, [this, &listWidget, &fileList, &dialog] {
         for (int i = 0; i < listWidget->count(); i++)
         {
             if (!m_gcodeEditor->saveFile(fileList.at(i))) {
                 QMessageBox::information(this, i18n("Save Failed"), i18n("Failed to save file: %1").arg(fileList.at(i).toLocalFile()));
                 dialog->reject();
             } else {
                 QString txt = listWidget->item(listWidget->currentRow())->text();
                 txt.remove(" [*]");
                 listWidget->item(listWidget->currentRow())->setText(txt);
             }
         }
         dialog->accept();
     });
     hLayout->addWidget(saveAllBtn);
 
     auto cancelBtn = new QPushButton(QIcon::fromTheme("dialog-cancel", QIcon(QStringLiteral(":/%1/cancel").arg(m_theme))), i18n("Cancel"));
     cancelBtn->setIconSize(iconSize);
     connect(cancelBtn, &QPushButton::clicked, this, [&dialog] {
         dialog->reject();
     });
     hLayout->addWidget(cancelBtn);
 
     auto ignoreBtn = new QPushButton(QIcon::fromTheme("window-close", QIcon(QStringLiteral(":/icon/close"))), i18n("Ignore"));
     ignoreBtn->setIconSize(iconSize);
     connect(ignoreBtn, &QPushButton::clicked, this, [&dialog] {
         dialog->accept();
     });
     hLayout->addWidget(ignoreBtn);
 
     auto layout = new QVBoxLayout;
     auto label = new QLabel(i18n("Files with Unsaved Changes."));
     layout->addWidget(label);
     layout->addWidget(listWidget);
     layout->addItem(hLayout);
     dialog->setLayout(layout);
 
     return dialog->exec();
 }
 
 void MainWindow::updateBedSize(const QSize &newSize)
 {
     m_lateral.get<Viewer3D>("3d")->setBedSize(newSize);
 }