diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index fde268670..2d648a6cf 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -41,22 +41,22 @@
 
 MainWindow::MainWindow(QWidget *parent, const QString &filename)
     : QMainWindow(parent)
-    , ui(new Ui::MainWindow)
-    , editor(new Editor(this))
-    , undoView(nullptr)
-    , firstResult(nullptr)
-    , loadedAutosave(false)
-    , autosaveFilename("")
-    , dolphinFilename("none")
-    , bd(nullptr)
-    , translator(nullptr)
+    , m_ui(new Ui::MainWindow)
+    , m_editor(new Editor(this))
+    , m_undoView(nullptr)
+    , m_firstResult(nullptr)
+    , m_loadedAutosave(false)
+    , m_autosaveFilename("")
+    , m_dolphinFilename("none")
+    , m_bd(nullptr)
+    , m_translator(nullptr)   
     , m_settings(new WPandaSettings)
 {
     COMMENT("WIRED PANDA Version = " << APP_VERSION << " OR " << GlobalProperties::version, 0);
-    ui->setupUi(this);
+    m_ui->setupUi(this);
     ThemeManager::globalMngr = new ThemeManager(this);
     buildFullScreenDialog();
-    ui->graphicsView->setScene(editor->getScene());
+    m_ui->graphicsView->setScene(m_editor->getScene());
 
     m_settings->load();
 
@@ -65,51 +65,52 @@ MainWindow::MainWindow(QWidget *parent, const QString &filename)
 
     loadTranslation(m_settings->language());
 
-    if (autosaveFilename != "") {
+    if (m_autosaveFilename != "") {
         // If autosaveFile was found within the config. file, then WiredPanda probably didn't save its last project correctly, perhaps due to a crash.
-        if ((QFile(autosaveFilename).exists()) && (autosaveFilename != filename)) {
-            int ret = recoverAutoSaveFile(autosaveFilename);
+        if ((QFile(m_autosaveFilename).exists()) && (m_autosaveFilename != filename)) {
+            int ret = recoverAutoSaveFile(m_autosaveFilename);
             if (ret == QMessageBox::Yes) {
                 auto *wPanda = new QProcess(nullptr);
                 QStringList args;
-                args << autosaveFilename;
+                args << m_autosaveFilename;
                 wPanda->start(QCoreApplication::applicationFilePath(), args);
                 COMMENT("Reloaded autosave: " << args[0].toStdString(), 0);
             }
-        } else if ((QFile(autosaveFilename).exists()) && (autosaveFilename == filename)) {
+        } else if ((QFile(m_autosaveFilename).exists()) && (m_autosaveFilename == filename)) {
             COMMENT("Loading autosave!", 0);
-            loadedAutosave = true;
+            m_loadedAutosave = true;
         }
     }
 
+    // TODO: remove geometry from settings save
     restoreGeometry(GlobalProperties::settingToByteArray(m_settings->windowGeometry()));
     restoreState(GlobalProperties::settingToByteArray(m_settings->windowState()));
 
-    ui->splitter->restoreGeometry(GlobalProperties::settingToByteArray(m_settings->splitterGeometry()));
-    ui->splitter->restoreState(GlobalProperties::settingToByteArray(m_settings->splitterState()));
+    m_ui->splitter->restoreGeometry(GlobalProperties::settingToByteArray(m_settings->splitterGeometry()));
+    m_ui->splitter->restoreState(GlobalProperties::settingToByteArray(m_settings->splitterState()));
 
-    ui->actionExport_to_Arduino->setEnabled(false);
+    m_ui->actionExport_to_Arduino->setEnabled(false);
 
     QList<QKeySequence> zoom_in_shortcuts;
     zoom_in_shortcuts << QKeySequence("Ctrl++") << QKeySequence("Ctrl+=");
-    ui->actionZoom_in->setShortcuts(zoom_in_shortcuts);
+    m_ui->actionZoom_in->setShortcuts(zoom_in_shortcuts);
 
     /* THEME */
     auto *themeGroup = new QActionGroup(this);
-    auto const actions = ui->menuTheme->actions();
+    auto const actions = m_ui->menuTheme->actions();
     for (QAction *action : actions) {
         themeGroup->addAction(action);
     }
     themeGroup->setExclusive(true);
 
     connect(ThemeManager::globalMngr, &ThemeManager::themeChanged, this, &MainWindow::updateTheme);
-    connect(ThemeManager::globalMngr, &ThemeManager::themeChanged, editor, &Editor::updateTheme);
+    connect(ThemeManager::globalMngr, &ThemeManager::themeChanged, m_editor, &Editor::updateTheme);
     ThemeManager::globalMngr->initialize();
-    /*  ui->graphicsView->setBackgroundBrush(QBrush(QColor(Qt::gray))); */
+    /*  m_ui->graphicsView->setBackgroundBrush(QBrush(QColor(Qt::gray))); */
     setFastMode(m_settings->fastMode());
 
-    editor->setElementEditor(ui->widgetElementEditor);
-    ui->searchScrollArea->hide();
+    m_editor->setElementEditor(m_ui->widgetElementEditor);
+    m_ui->searchScrollArea->hide();
 
     setCurrentFile(QFileInfo());
 
@@ -119,78 +120,77 @@ MainWindow::MainWindow(QWidget *parent, const QString &filename)
      * #endif
      */
 
-    connect(ui->actionCopy, &QAction::triggered, editor, &Editor::copyAction);
-    connect(ui->actionCut, &QAction::triggered, editor, &Editor::cutAction);
-    connect(ui->actionPaste, &QAction::triggered, editor, &Editor::pasteAction);
-    connect(ui->actionDelete, &QAction::triggered, editor, &Editor::deleteAction);
+    connect(m_ui->actionCopy, &QAction::triggered, m_editor, &Editor::copyAction);
+    connect(m_ui->actionCut, &QAction::triggered, m_editor, &Editor::cutAction);
+    connect(m_ui->actionPaste, &QAction::triggered, m_editor, &Editor::pasteAction);
+    connect(m_ui->actionDelete, &QAction::triggered, m_editor, &Editor::deleteAction);
 
-    undoAction = editor->getUndoStack()->createUndoAction(this, tr("&Undo"));
-    undoAction->setIcon(QIcon(QPixmap(":/toolbar/undo.png")));
-    undoAction->setShortcuts(QKeySequence::Undo);
+    m_undoAction = m_editor->getUndoStack()->createUndoAction(this, tr("&Undo"));
+    m_undoAction->setIcon(QIcon(QPixmap(":/toolbar/undo.png")));
+    m_undoAction->setShortcuts(QKeySequence::Undo);
 
-    redoAction = editor->getUndoStack()->createRedoAction(this, tr("&Redo"));
-    redoAction->setIcon(QIcon(QPixmap(":/toolbar/redo.png")));
-    redoAction->setShortcuts(QKeySequence::Redo);
+    m_redoAction = m_editor->getUndoStack()->createRedoAction(this, tr("&Redo"));
+    m_redoAction->setIcon(QIcon(QPixmap(":/toolbar/redo.png")));
+    m_redoAction->setShortcuts(QKeySequence::Redo);
 
-    ui->menuEdit->insertAction(ui->menuEdit->actions().at(0), undoAction);
-    ui->menuEdit->insertAction(undoAction, redoAction);
+    m_ui->menuEdit->insertAction(m_ui->menuEdit->actions().at(0), m_undoAction);
+    m_ui->menuEdit->insertAction(m_undoAction, m_redoAction);
 
-    connect(ui->graphicsView->gvzoom(), &GraphicsViewZoom::zoomed, this, &MainWindow::zoomChanged);
-    connect(editor, &Editor::scroll, this, &MainWindow::scrollView);
-    connect(editor, &Editor::circuitHasChanged, this, &MainWindow::autoSave);
+    connect(m_ui->graphicsView->gvzoom(), &GraphicsViewZoom::zoomed, this, &MainWindow::zoomChanged);
+    connect(m_editor, &Editor::scroll, this, &MainWindow::scrollView);
+    connect(m_editor, &Editor::circuitHasChanged, this, &MainWindow::autoSave);
 
-    rfController = new RecentFilesController(this, true);
-    ricController = new RecentFilesController(this, false);
-    connect(this, &MainWindow::addRecentFile, rfController, &RecentFilesController::addRecentFile);
-    connect(this, &MainWindow::addRecentIcFile, ricController, &RecentFilesController::addRecentFile);
+    m_rfController = new RecentFilesController(this, true);
+    m_ricController = new RecentFilesController(this, false);
+    connect(this, &MainWindow::addRecentFile, m_rfController, &RecentFilesController::addRecentFile);
+    connect(this, &MainWindow::addRecentIcFile, m_ricController, &RecentFilesController::addRecentFile);
 
     auto *shortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_F), this);
-    connect(shortcut, &QShortcut::activated, ui->lineEdit, QOverload<>::of(&QWidget::setFocus));
-    ui->graphicsView->setCacheMode(QGraphicsView::CacheBackground);
+    connect(shortcut, &QShortcut::activated, m_ui->lineEdit, QOverload<>::of(&QWidget::setFocus));
+    m_ui->graphicsView->setCacheMode(QGraphicsView::CacheBackground);
     updateRecentICs();
     createRecentFileActions();
     updateRecentFileActions();
 
-    connect(rfController, &RecentFilesController::recentFilesUpdated, this, &MainWindow::updateRecentFileActions);
-    connect(ricController, &RecentFilesController::recentFilesUpdated, this, &MainWindow::updateRecentICs);
+    connect(m_rfController, &RecentFilesController::recentFilesUpdated, this, &MainWindow::updateRecentFileActions);
+    connect(m_ricController, &RecentFilesController::recentFilesUpdated, this, &MainWindow::updateRecentICs);
     /*  QApplication::setStyle( QStyleFactory::create( "Fusion" ) ); */
-    ui->actionPlay->setChecked(true);
+    m_ui->actionPlay->setChecked(true);
     populateLeftMenu();
 }
 
-WPandaSettings *MainWindow::settings() {
-    return m_settings;
-}
-
 void MainWindow::setFastMode(bool fastModeEnabled)
 {
-    ui->graphicsView->setRenderHint(QPainter::Antialiasing, !fastModeEnabled);
-    ui->graphicsView->setRenderHint(QPainter::SmoothPixmapTransform, !fastModeEnabled);
+    m_ui->graphicsView->setRenderHint(QPainter::Antialiasing, !fastModeEnabled);
+    m_ui->graphicsView->setRenderHint(QPainter::SmoothPixmapTransform, !fastModeEnabled);
 
-    fullscreenView->setRenderHint(QPainter::Antialiasing, !fastModeEnabled);
-    fullscreenView->setRenderHint(QPainter::SmoothPixmapTransform, !fastModeEnabled);
+    m_fullscreenView->setRenderHint(QPainter::Antialiasing, !fastModeEnabled);
+    m_fullscreenView->setRenderHint(QPainter::SmoothPixmapTransform, !fastModeEnabled);
 
-    ui->actionFast_Mode->setChecked(fastModeEnabled);
+    m_ui->actionFast_Mode->setChecked(fastModeEnabled);
 }
 
 void MainWindow::createUndoView()
 {
-    undoView = new QUndoView(editor->getUndoStack());
-    undoView->setWindowTitle(tr("Command List"));
-    undoView->show();
-    undoView->setAttribute(Qt::WA_QuitOnClose, false);
+    m_undoView = new QUndoView(m_editor->getUndoStack());
+    m_undoView->setWindowTitle(tr("Command List"));
+    m_undoView->show();
+    m_undoView->setAttribute(Qt::WA_QuitOnClose, false);
 }
 
 MainWindow::~MainWindow()
 {
+    if (m_bd) {
+        delete m_bd;
+    }
+    if (m_undoView) {
+        delete m_undoView;
+    }
+    delete m_editor;
     m_settings->save();
-    m_settings->deleteLater();
 
-    if (undoView) {
-        delete undoView;
+    delete m_ui;
     }
-    delete ui;
-}
 
 void MainWindow::on_actionExit_triggered()
 {
@@ -199,11 +199,11 @@ void MainWindow::on_actionExit_triggered()
 
 bool MainWindow::save(QString fname)
 {
-    COMMENT("fname: " << fname.toStdString() << ", autosave: " << autosaveFilename.toStdString(), 0);
-    if ((fname.isEmpty()) || (loadedAutosave)) {
-        fname = currentFile.absoluteFilePath();
-        if ((currentFile.fileName().isEmpty()) || (loadedAutosave)) {
-            fname = QFileDialog::getSaveFileName(this, tr("Save File"), defaultDirectory.absolutePath(), tr("Panda files (*.panda)"));
+    COMMENT("fname: " << fname.toStdString() << ", autosave: " << m_autosaveFilename.toStdString(), 0);
+    if ((fname.isEmpty()) || (m_loadedAutosave)) {
+        fname = m_currentFile.absoluteFilePath();
+        if ((m_currentFile.fileName().isEmpty()) || (m_loadedAutosave)) {
+            fname = QFileDialog::getSaveFileName(this, tr("Save File"), m_defaultDirectory.absolutePath(), tr("Panda files (*.panda)"));
         }
     }
     if (fname.isEmpty()) {
@@ -216,19 +216,19 @@ bool MainWindow::save(QString fname)
     if (fl.open(QFile::WriteOnly)) {
         QDataStream ds(&fl);
         try {
-            editor->save(ds, dolphinFilename);
+            m_editor->save(ds, m_dolphinFilename);
         } catch (std::runtime_error &e) {
             std::cerr << tr("Error saving project: ").toStdString() << e.what() << std::endl;
             return false;
         }
     }
     if (fl.commit()) {
-        loadedAutosave = false;
+        m_loadedAutosave = false;
         setCurrentFile(QFileInfo(fname));
-        ui->statusBar->showMessage(tr("Saved file successfully."), 2000);
-        editor->getUndoStack()->setClean();
-        if (autosaveFile.isOpen()) {
-            autosaveFile.remove();
+        m_ui->statusBar->showMessage(tr("Saved file successfully."), 2000);
+        m_editor->getUndoStack()->setClean();
+        if (m_autosaveFile.isOpen()) {
+            m_autosaveFile.remove();
             m_settings->setAutoSaveFile(QStringLiteral(""));
         }
         return true;
@@ -240,13 +240,13 @@ bool MainWindow::save(QString fname)
 void MainWindow::show()
 {
     QMainWindow::show();
-    editor->clear();
+    m_editor->clear();
 }
 
 void MainWindow::clear()
 {
-    editor->clear();
-    dolphinFilename = "none";
+    m_editor->clear();
+    m_dolphinFilename = "none";
     setCurrentFile(QFileInfo());
 }
 
@@ -283,17 +283,17 @@ void MainWindow::on_actionNew_triggered()
 
 void MainWindow::on_actionWires_triggered(bool checked)
 {
-    editor->showWires(checked);
+    m_editor->showWires(checked);
 }
 
 void MainWindow::on_actionRotate_right_triggered()
 {
-    editor->rotate(true);
+    m_editor->rotate(true);
 }
 
 void MainWindow::on_actionRotate_left_triggered()
 {
-    editor->rotate(false);
+    m_editor->rotate(false);
 }
 
 bool MainWindow::loadPandaFile(const QString &fname)
@@ -312,9 +312,9 @@ bool MainWindow::loadPandaFile(const QString &fname)
         COMMENT("Current file set.", 0);
         try {
             COMMENT("Loading in editor.", 0);
-            editor->load(ds);
+            m_editor->load(ds);
             COMMENT("Loaded. Emitting changed signal.", 0);
-            emit editor->circuitHasChanged();
+            emit m_editor->circuitHasChanged();
             COMMENT("Finished updating changed by signal.", 0);
         } catch (std::runtime_error &e) {
             std::cerr << tr("Error loading project: ").toStdString() << e.what() << std::endl;
@@ -330,19 +330,19 @@ bool MainWindow::loadPandaFile(const QString &fname)
     fl.close();
     // COMMENT( "Adding to controller.", 0 );
     //  emit addRecentFile( fname );
-    ui->statusBar->showMessage(tr("File loaded successfully."), 2000);
+    m_ui->statusBar->showMessage(tr("File loaded successfully."), 2000);
     /*  on_actionWaveform_triggered( ); */
     return true;
 }
 
 void MainWindow::scrollView(int dx, int dy)
 {
-    ui->graphicsView->scroll(dx, dy);
+    m_ui->graphicsView->scroll(dx, dy);
 }
 
 void MainWindow::on_actionOpen_triggered()
 {
-    QString fname = QFileDialog::getOpenFileName(this, tr("Open File"), defaultDirectory.absolutePath(), tr("Panda files (*.panda)"));
+    QString fname = QFileDialog::getOpenFileName(this, tr("Open File"), m_defaultDirectory.absolutePath(), tr("Panda files (*.panda)"));
     if (fname.isEmpty()) {
         return;
     }
@@ -382,15 +382,15 @@ void MainWindow::on_actionAbout_Qt_triggered()
 bool MainWindow::closeFile()
 {
     bool ok = true;
-    if (!editor->getUndoStack()->isClean()) {
+    if (!m_editor->getUndoStack()->isClean()) {
         int ret = confirmSave();
         if (ret == QMessageBox::Save) {
             ok = save();
         } else if (ret == QMessageBox::Cancel) {
             ok = false;
         } else { // Close without saving. Deleting autosave if it was opened.
-            if (loadedAutosave) {
-                autosaveFile.remove();
+            if (m_loadedAutosave) {
+                m_autosaveFile.remove();
                 m_settings->setAutoSaveFile(QStringLiteral(""));
             }
         }
@@ -402,10 +402,11 @@ void MainWindow::closeEvent(QCloseEvent *e)
 {
     Q_UNUSED(e);
 
+    // TODO: remove geometry from settings save
     m_settings->setWindowGeometry(GlobalProperties::settingToIntList(saveGeometry()));
     m_settings->setWindowState(GlobalProperties::settingToIntList(saveState()));
-    m_settings->setSplitterGeometry(GlobalProperties::settingToIntList(ui->splitter->saveGeometry()));
-    m_settings->setSplitterState(GlobalProperties::settingToIntList(ui->splitter->saveState()));
+    m_settings->setSplitterGeometry(GlobalProperties::settingToIntList(m_ui->splitter->saveGeometry()));
+    m_settings->setSplitterState(GlobalProperties::settingToIntList(m_ui->splitter->saveState()));
     m_settings->save();
 
     if (closeFile()) {
@@ -417,10 +418,10 @@ void MainWindow::closeEvent(QCloseEvent *e)
 
 void MainWindow::on_actionSave_As_triggered()
 {
-    QString fname = currentFile.absoluteFilePath();
-    QString path = defaultDirectory.absolutePath();
-    if (!currentFile.fileName().isEmpty()) {
-        path = currentFile.absoluteFilePath();
+    QString fname = m_currentFile.absoluteFilePath();
+    QString path = m_defaultDirectory.absolutePath();
+    if (!m_currentFile.fileName().isEmpty()) {
+        path = m_currentFile.absoluteFilePath();
     }
     fname = QFileDialog::getSaveFileName(this, tr("Save File as ..."), path, tr("Panda files (*.panda)"));
     if (fname.isEmpty()) {
@@ -435,7 +436,7 @@ void MainWindow::on_actionSave_As_triggered()
 
 QFileInfo MainWindow::getCurrentFile() const
 {
-    return currentFile;
+    return m_currentFile;
 }
 
 void MainWindow::setCurrentFile(const QFileInfo &file)
@@ -446,62 +447,62 @@ void MainWindow::setCurrentFile(const QFileInfo &file)
         COMMENT("Autosave path set to the current file's directory, if there is one.", 0);
         autosavePath = file.dir();
         COMMENT("Autosavepath: " << autosavePath.absolutePath().toStdString(), 0);
-        autosaveFile.setFileTemplate(autosavePath.absoluteFilePath(file.baseName() + "XXXXXX.panda"));
+        m_autosaveFile.setFileTemplate(autosavePath.absoluteFilePath(file.baseName() + "XXXXXX.panda"));
         COMMENT("Setting current file to: " << file.absoluteFilePath().toStdString(), 0);
     } else {
         COMMENT("Default file does not exist: " << file.absoluteFilePath().toStdString(), 0);
         QDir autosavePath(QDir::temp());
         COMMENT("Autosavepath: " << autosavePath.absolutePath().toStdString(), 0);
-        autosaveFile.setFileTemplate(autosavePath.absoluteFilePath("XXXXXX.panda"));
+        m_autosaveFile.setFileTemplate(autosavePath.absoluteFilePath("XXXXXX.panda"));
         COMMENT("Setting current file to random file in tmp.", 0);
     }
-    currentFile = file;
+    m_currentFile = file;
     if (file.fileName().isEmpty()) {
         setWindowTitle("wiRED PANDA v" + QString(APP_VERSION));
     } else {
         setWindowTitle(QString("wiRED PANDA v%1 [%2]").arg(APP_VERSION, file.fileName()));
     }
-    if (!loadedAutosave) {
+    if (!m_loadedAutosave) {
         COMMENT("Adding file to controller.", 0);
         emit addRecentFile(file.absoluteFilePath());
     }
-    GlobalProperties::currentFile = currentFile.absoluteFilePath();
+    GlobalProperties::currentFile = m_currentFile.absoluteFilePath();
     COMMENT("Setting global current file.", 0);
-    if (currentFile.exists()) {
-        defaultDirectory = currentFile.dir();
+    if (m_currentFile.exists()) {
+        m_defaultDirectory = m_currentFile.dir();
     } else {
-        defaultDirectory = QDir::home();
+        m_defaultDirectory = QDir::home();
     }
 }
 
 void MainWindow::on_actionSelect_all_triggered()
 {
-    editor->selectAll();
+    m_editor->selectAll();
 }
 
 void MainWindow::updateRecentICs()
 {
-    ui->scrollAreaWidgetContents_Box->layout()->removeItem(ui->verticalSpacer_BOX);
-    for (ListItemWidget *item : qAsConst(boxItemWidgets)) {
+    m_ui->scrollAreaWidgetContents_Box->layout()->removeItem(m_ui->verticalSpacer_BOX);
+    for (ListItemWidget *item : qAsConst(m_boxItemWidgets)) {
         item->deleteLater();
     }
     /*  qDeleteAll( boxItemWidgets ); */
-    boxItemWidgets.clear();
+    m_boxItemWidgets.clear();
 
     //! Show recent files
-    const QStringList files = ricController->getRecentFiles();
+    const QStringList files = m_ricController->getRecentFiles();
     for (const QString &file : files) {
         QPixmap pixmap(QString::fromUtf8(":/basic/box.png"));
         auto *item = new ListItemWidget(pixmap, ElementType::IC, file, this);
-        boxItemWidgets.append(item);
-        ui->scrollAreaWidgetContents_Box->layout()->addWidget(item);
+        m_boxItemWidgets.append(item);
+        m_ui->scrollAreaWidgetContents_Box->layout()->addWidget(item);
     }
-    ui->scrollAreaWidgetContents_Box->layout()->addItem(ui->verticalSpacer_BOX);
+    m_ui->scrollAreaWidgetContents_Box->layout()->addItem(m_ui->verticalSpacer_BOX);
 }
 
 QString MainWindow::getOpenICFile()
 {
-    return QFileDialog::getOpenFileName(this, tr("Open File as IC"), defaultDirectory.absolutePath(), tr("Panda files (*.panda)"));
+    return QFileDialog::getOpenFileName(this, tr("Open File as IC"), m_defaultDirectory.absolutePath(), tr("Panda files (*.panda)"));
 }
 
 void MainWindow::on_actionOpen_IC_triggered()
@@ -524,29 +525,29 @@ void MainWindow::on_actionOpen_IC_triggered()
     }
     fl.close();
 
-    ui->statusBar->showMessage(tr("Loaded ic successfully."), 2000);
+    m_ui->statusBar->showMessage(tr("Loaded ic successfully."), 2000);
 }
 
 void MainWindow::on_lineEdit_textChanged(const QString &text)
 {
-    ui->searchLayout->removeItem(ui->VSpacer);
-    for (ListItemWidget *item : qAsConst(searchItemWidgets)) {
+    m_ui->searchLayout->removeItem(m_ui->VSpacer);
+    for (ListItemWidget *item : qAsConst(m_searchItemWidgets)) {
         item->deleteLater();
     }
-    searchItemWidgets.clear();
-    firstResult = nullptr;
+    m_searchItemWidgets.clear();
+    m_firstResult = nullptr;
     if (text.isEmpty()) {
-        ui->searchScrollArea->hide();
-        ui->tabWidget->show();
+        m_ui->searchScrollArea->hide();
+        m_ui->tabWidget->show();
     } else {
-        ui->searchScrollArea->show();
-        ui->tabWidget->hide();
-        QList<Label *> ics = ui->tabWidget->findChildren<Label *>("label_ic");
+        m_ui->searchScrollArea->show();
+        m_ui->tabWidget->hide();
+        QList<Label *> ics = m_ui->tabWidget->findChildren<Label *>("label_ic");
         QRegularExpression regex(QString(".*%1.*").arg(text), QRegularExpression::CaseInsensitiveOption);
         QList<Label *> searchResults;
         QRegularExpression regex2(QString("^label_.*%1.*").arg(text), QRegularExpression::CaseInsensitiveOption);
-        searchResults.append(ui->tabWidget->findChildren<Label *>(regex2));
-        QList<Label *> allLabels = ui->tabWidget->findChildren<Label *>();
+        searchResults.append(m_ui->tabWidget->findChildren<Label *>(regex2));
+        QList<Label *> allLabels = m_ui->tabWidget->findChildren<Label *>();
         for (Label *lb : qAsConst(allLabels)) {
             if (regex.match(lb->name()).hasMatch()) {
                 if (!searchResults.contains(lb)) {
@@ -565,47 +566,47 @@ void MainWindow::on_lineEdit_textChanged(const QString &text)
 #else
             auto *item = new ListItemWidget(*label->pixmap(), label->elementType(), label->auxData());
 #endif
-            if (!firstResult) {
-                firstResult = item->getLabel();
+            if (!m_firstResult) {
+                m_firstResult = item->getLabel();
             }
-            ui->searchLayout->addWidget(item);
-            searchItemWidgets.append(item);
+            m_ui->searchLayout->addWidget(item);
+            m_searchItemWidgets.append(item);
         }
     }
-    ui->searchLayout->addItem(ui->VSpacer);
+    m_ui->searchLayout->addItem(m_ui->VSpacer);
 }
 
 void MainWindow::on_lineEdit_returnPressed()
 {
-    if (firstResult) {
-        firstResult->startDrag();
-        ui->lineEdit->clear();
+    if (m_firstResult) {
+        m_firstResult->startDrag();
+        m_ui->lineEdit->clear();
     }
 }
 
 void MainWindow::resizeEvent(QResizeEvent *)
 {
-    editor->getScene()->setSceneRect(editor->getScene()->sceneRect().united(ui->graphicsView->rect()));
+    m_editor->getScene()->setSceneRect(m_editor->getScene()->sceneRect().united(m_ui->graphicsView->rect()));
 }
 
 void MainWindow::on_actionReload_File_triggered()
 {
-    if (currentFile.exists()) {
+    if (m_currentFile.exists()) {
         if (closeFile()) {
-            loadPandaFile(currentFile.absoluteFilePath());
+            loadPandaFile(m_currentFile.absoluteFilePath());
         }
     }
 }
 
 void MainWindow::on_actionGates_triggered(bool checked)
 {
-    ui->actionWires->setEnabled(checked);
+    m_ui->actionWires->setEnabled(checked);
     if (!checked) {
-        editor->showWires(checked);
+        m_editor->showWires(checked);
     } else {
-        editor->showWires(ui->actionWires->isChecked());
+        m_editor->showWires(m_ui->actionWires->isChecked());
     }
-    editor->showGates(checked);
+    m_editor->showGates(checked);
 }
 
 bool MainWindow::exportToArduino(QString fname)
@@ -614,8 +615,8 @@ bool MainWindow::exportToArduino(QString fname)
         if (fname.isEmpty()) {
             return false;
         }
-        QVector<GraphicElement *> elements = editor->getScene()->getElements();
-        SimulationController *sc = editor->getSimulationController();
+        QVector<GraphicElement *> elements = m_editor->getScene()->getElements();
+        SimulationController *sc = m_editor->getSimulationController();
         sc->stop();
         if (elements.isEmpty()) {
             return false;
@@ -628,7 +629,7 @@ bool MainWindow::exportToArduino(QString fname)
         CodeGenerator arduino(QDir::home().absoluteFilePath(fname), elements);
         arduino.generate();
         sc->start();
-        ui->statusBar->showMessage(tr("Arduino code successfully generated."), 2000);
+        m_ui->statusBar->showMessage(tr("Arduino code successfully generated."), 2000);
 
         qDebug() << "Arduino code successfully generated.";
     } catch (std::runtime_error &e) {
@@ -645,12 +646,12 @@ bool MainWindow::exportToWaveFormFile(const QString& fname)
         if ((fname.isEmpty()) || (fname == "none")) {
             return false;
         }
-        bd = new BewavedDolphin(editor, this);
-        if (!bd->createWaveform(dolphinFilename)) {
-            std::cerr << ERRORMSG(tr("Could not open waveform file: %1.").arg(currentFile.fileName()).toStdString()) << std::endl;
+        m_bd = new BewavedDolphin(m_editor, this);
+        if (!m_bd->createWaveform(m_dolphinFilename)) {
+            std::cerr << ERRORMSG(tr("Could not open waveform file: %1.").arg(m_currentFile.fileName()).toStdString()) << std::endl;
             return false;
         }
-        bd->print();
+        m_bd->print();
     } catch (std::runtime_error &e) {
         QMessageBox::warning(this, tr("Error"), tr("<strong>Error while exporting to waveform file:</strong><br>%1").arg(e.what()));
         return false;
@@ -660,7 +661,7 @@ bool MainWindow::exportToWaveFormFile(const QString& fname)
 
 bool MainWindow::on_actionExport_to_Arduino_triggered()
 {
-    QString fname = QFileDialog::getSaveFileName(this, tr("Generate Arduino Code"), defaultDirectory.absolutePath(), tr("Arduino file (*.ino)"));
+    QString fname = QFileDialog::getSaveFileName(this, tr("Generate Arduino Code"), m_defaultDirectory.absolutePath(), tr("Arduino file (*.ino)"));
     return exportToArduino(fname);
 }
 
@@ -668,42 +669,42 @@ void MainWindow::on_actionZoom_in_triggered()
 {
     /*  QPointF scenePos = editor->getMousePos(); */
 
-    /*  QPointF screenCtr = ui->graphicsView->rect().center(); */
-    ui->graphicsView->gvzoom()->zoomIn();
+    /*  QPointF screenCtr = m_ui->graphicsView->rect().center(); */
+    m_ui->graphicsView->gvzoom()->zoomIn();
 }
 
 void MainWindow::on_actionZoom_out_triggered()
 {
-    ui->graphicsView->gvzoom()->zoomOut();
+    m_ui->graphicsView->gvzoom()->zoomOut();
 }
 
 void MainWindow::on_actionReset_Zoom_triggered()
 {
-    ui->graphicsView->gvzoom()->resetZoom();
+    m_ui->graphicsView->gvzoom()->resetZoom();
 }
 
 void MainWindow::zoomChanged()
 {
-    ui->actionZoom_in->setEnabled(ui->graphicsView->gvzoom()->canZoomIn());
-    ui->actionZoom_out->setEnabled(ui->graphicsView->gvzoom()->canZoomOut());
+    m_ui->actionZoom_in->setEnabled(m_ui->graphicsView->gvzoom()->canZoomIn());
+    m_ui->actionZoom_out->setEnabled(m_ui->graphicsView->gvzoom()->canZoomOut());
 }
 
 void MainWindow::updateRecentFileActions()
 {
-    QStringList files = rfController->getRecentFiles();
+    QStringList files = m_rfController->getRecentFiles();
 
     int numRecentFiles = qMin(files.size(), static_cast<int>(RecentFilesController::MaxRecentFiles));
     if (numRecentFiles > 0) {
-        ui->menuRecent_files->setEnabled(true);
+        m_ui->menuRecent_files->setEnabled(true);
     }
     for (int i = 0; i < numRecentFiles; ++i) {
         QString text = QString("&%1 %2").arg(i + 1).arg(QFileInfo(files[i]).fileName());
-        recentFileActs[i]->setText(text);
-        recentFileActs[i]->setData(files[i]);
-        recentFileActs[i]->setVisible(true);
+        m_recentFileActs[i]->setText(text);
+        m_recentFileActs[i]->setData(files[i]);
+        m_recentFileActs[i]->setVisible(true);
     }
     for (int i = numRecentFiles; i < RecentFilesController::MaxRecentFiles; ++i) {
-        recentFileActs[i]->setVisible(false);
+        m_recentFileActs[i]->setVisible(false);
     }
 }
 
@@ -720,20 +721,20 @@ void MainWindow::openRecentFile()
 void MainWindow::createRecentFileActions()
 {
     for (int i = 0; i < RecentFilesController::MaxRecentFiles; ++i) {
-        recentFileActs[i] = new QAction(this);
-        recentFileActs[i]->setVisible(false);
-        connect(recentFileActs[i], &QAction::triggered, this, &MainWindow::openRecentFile);
-        ui->menuRecent_files->addAction(recentFileActs[i]);
+        m_recentFileActs[i] = new QAction(this);
+        m_recentFileActs[i]->setVisible(false);
+        connect(m_recentFileActs[i], &QAction::triggered, this, &MainWindow::openRecentFile);
+        m_ui->menuRecent_files->addAction(m_recentFileActs[i]);
     }
     updateRecentFileActions();
     for (int i = 0; i < RecentFilesController::MaxRecentFiles; ++i) {
-        ui->menuRecent_files->addAction(recentFileActs[i]);
+        m_ui->menuRecent_files->addAction(m_recentFileActs[i]);
     }
 }
 
 void MainWindow::on_actionPrint_triggered()
 {
-    QString pdfFile = QFileDialog::getSaveFileName(this, tr("Export to PDF"), defaultDirectory.absolutePath(), tr("PDF files (*.pdf)"));
+    QString pdfFile = QFileDialog::getSaveFileName(this, tr("Export to PDF"), m_defaultDirectory.absolutePath(), tr("PDF files (*.pdf)"));
     if (pdfFile.isEmpty()) {
         return;
     }
@@ -750,25 +751,25 @@ void MainWindow::on_actionPrint_triggered()
         QMessageBox::warning(this, tr("ERROR"), tr("Could not print this circuit to PDF."), QMessageBox::Ok);
         return;
     }
-    editor->getScene()->render(&p, QRectF(), editor->getScene()->itemsBoundingRect().adjusted(-64, -64, 64, 64));
+    m_editor->getScene()->render(&p, QRectF(), m_editor->getScene()->itemsBoundingRect().adjusted(-64, -64, 64, 64));
     p.end();
 }
 
 void MainWindow::on_actionExport_to_Image_triggered()
 {
-    QString pngFile = QFileDialog::getSaveFileName(this, tr("Export to Image"), defaultDirectory.absolutePath(), tr("PNG files (*.png)"));
+    QString pngFile = QFileDialog::getSaveFileName(this, tr("Export to Image"), m_defaultDirectory.absolutePath(), tr("PNG files (*.png)"));
     if (pngFile.isEmpty()) {
         return;
     }
     if (!pngFile.endsWith(".png", Qt::CaseInsensitive)) {
         pngFile.append(".png");
     }
-    QRectF s = editor->getScene()->itemsBoundingRect().adjusted(-64, -64, 64, 64);
+    QRectF s = m_editor->getScene()->itemsBoundingRect().adjusted(-64, -64, 64, 64);
     QPixmap p(s.size().toSize());
     QPainter painter;
     painter.begin(&p);
     painter.setRenderHint(QPainter::Antialiasing);
-    editor->getScene()->render(&painter, QRectF(), s);
+    m_editor->getScene()->render(&painter, QRectF(), s);
     painter.end();
     QImage img = p.toImage();
     img.save(pngFile);
@@ -776,10 +777,10 @@ void MainWindow::on_actionExport_to_Image_triggered()
 
 void MainWindow::retranslateUi()
 {
-    ui->retranslateUi(this);
-    ui->widgetElementEditor->retranslateUi();
+    m_ui->retranslateUi(this);
+    m_ui->widgetElementEditor->retranslateUi();
 
-    QList<ListItemWidget *> items = ui->tabWidget->findChildren<ListItemWidget *>();
+    QList<ListItemWidget *> items = m_ui->tabWidget->findChildren<ListItemWidget *>();
     for (ListItemWidget *item : qAsConst(items)) {
         item->updateName();
     }
@@ -787,12 +788,12 @@ void MainWindow::retranslateUi()
 
 void MainWindow::loadTranslation(const QString& language)
 {
-    if (translator) {
-        qApp->removeTranslator(translator);
+    if (m_translator) {
+        qApp->removeTranslator(m_translator);
     }
-    translator = new QTranslator(this);
-    if (translator->load(language)) {
-        qApp->installTranslator(translator);
+    m_translator = new QTranslator(this);
+    if (m_translator->load(language)) {
+        qApp->installTranslator(m_translator);
         retranslateUi();
     } else {
         QMessageBox::critical(this, "Error!", "Error loading translation!");
@@ -818,29 +819,29 @@ void MainWindow::on_actionPortuguese_triggered()
 void MainWindow::on_actionPlay_triggered(bool checked)
 {
     if (checked) {
-        editor->getSimulationController()->start();
+        m_editor->getSimulationController()->start();
     } else {
-        editor->getSimulationController()->stop();
+        m_editor->getSimulationController()->stop();
     }
-    editor->getSimulationController()->updateAll();
+    m_editor->getSimulationController()->updateAll();
 }
 
 void MainWindow::on_actionRename_triggered()
 {
-    editor->getElementEditor()->renameAction();
+    m_editor->getElementEditor()->renameAction();
 }
 
 void MainWindow::on_actionChange_Trigger_triggered()
 {
-    editor->getElementEditor()->changeTriggerAction();
+    m_editor->getElementEditor()->changeTriggerAction();
 }
 
 void MainWindow::on_actionClear_selection_triggered()
 {
-    if (fullscreenDlg->isVisible() && editor->getScene()->selectedItems().isEmpty()) {
-        fullscreenDlg->accept();
+    if (m_fullscreenDlg->isVisible() && m_editor->getScene()->selectedItems().isEmpty()) {
+        m_fullscreenDlg->accept();
     }
-    editor->getScene()->clearSelection();
+    m_editor->getScene()->clearSelection();
 }
 
 void MainWindow::populateMenu(QSpacerItem *spacer, const QString& names, QLayout *layout)
@@ -860,9 +861,9 @@ void MainWindow::populateMenu(QSpacerItem *spacer, const QString& names, QLayout
 
 void MainWindow::populateLeftMenu()
 {
-    populateMenu(ui->verticalSpacer_InOut, "VCC,GND,BUTTON,SWITCH,CLOCK,LED,DISPLAY,DISPLAY14,BUZZER", ui->scrollAreaWidgetContents_InOut->layout());
-    populateMenu(ui->verticalSpacer_Gates, "AND,OR,NOT,NAND,NOR,XOR,XNOR,MUX,DEMUX,NODE", ui->scrollAreaWidgetContents_Gates->layout());
-    populateMenu(ui->verticalSpacer_Memory, "DFLIPFLOP,DLATCH,JKFLIPFLOP,SRFLIPFLOP,TFLIPFLOP", ui->scrollAreaWidgetContents_Memory->layout());
+    populateMenu(m_ui->verticalSpacer_InOut, "VCC,GND,BUTTON,SWITCH,CLOCK,LED,DISPLAY,DISPLAY14,BUZZER", m_ui->scrollAreaWidgetContents_InOut->layout());
+    populateMenu(m_ui->verticalSpacer_Gates, "AND,OR,NOT,NAND,NOR,XOR,XNOR,MUX,DEMUX,NODE", m_ui->scrollAreaWidgetContents_Gates->layout());
+    populateMenu(m_ui->verticalSpacer_Memory, "DFLIPFLOP,DLATCH,JKFLIPFLOP,SRFLIPFLOP,TFLIPFLOP", m_ui->scrollAreaWidgetContents_Memory->layout());
 }
 
 void MainWindow::on_actionFast_Mode_triggered(bool checked)
@@ -873,11 +874,12 @@ void MainWindow::on_actionFast_Mode_triggered(bool checked)
 
 void MainWindow::on_actionWaveform_triggered()
 {
-    bd = new BewavedDolphin(editor, this);
-    if (bd->createWaveform(dolphinFilename))
-        bd->show();
-    else
-        delete bd;
+    m_bd = new BewavedDolphin(m_editor, this);
+    if (m_bd->createWaveform(m_dolphinFilename)) {
+        m_bd->show();
+    } else {
+        delete m_bd;
+    }
 }
 
 void MainWindow::on_actionPanda_Light_triggered()
@@ -894,103 +896,103 @@ void MainWindow::updateTheme()
 {
     switch (ThemeManager::globalMngr->theme()) {
     case Theme::Panda_Dark:
-        ui->actionPanda_Dark->setChecked(true);
+        m_ui->actionPanda_Dark->setChecked(true);
         break;
     case Theme::Panda_Light:
-        ui->actionPanda_Light->setChecked(true);
+        m_ui->actionPanda_Light->setChecked(true);
         break;
     }
 }
 
 void MainWindow::on_actionFlip_horizontally_triggered()
 {
-    editor->flipH();
+    m_editor->flipH();
 }
 
 void MainWindow::on_actionFlip_vertically_triggered()
 {
-    editor->flipV();
+    m_editor->flipV();
 }
 
 void MainWindow::buildFullScreenDialog()
 {
-    fullscreenDlg = new QDialog(this);
-    fullscreenView = new GraphicsView(this);
-    fullscreenDlg->setWindowFlags(Qt::Window);
-    auto *dlg_layout = new QHBoxLayout(fullscreenDlg);
+    m_fullscreenDlg = new QDialog(this);
+    m_fullscreenView = new GraphicsView(this);
+    m_fullscreenDlg->setWindowFlags(Qt::Window);
+    auto *dlg_layout = new QHBoxLayout(m_fullscreenDlg);
 
-    fullscreenDlg->addActions(actions());
-    fullscreenDlg->addActions(ui->menuBar->actions());
+    m_fullscreenDlg->addActions(actions());
+    m_fullscreenDlg->addActions(m_ui->menuBar->actions());
 
     dlg_layout->setContentsMargins(0, 0, 0, 0);
     dlg_layout->setMargin(0);
-    dlg_layout->addWidget(fullscreenView);
-    fullscreenDlg->setLayout(dlg_layout);
-    fullscreenDlg->setStyleSheet("QGraphicsView { border-style: none; }");
-    fullscreenView->setScene(editor->getScene());
+    dlg_layout->addWidget(m_fullscreenView);
+    m_fullscreenDlg->setLayout(dlg_layout);
+    m_fullscreenDlg->setStyleSheet("QGraphicsView { border-style: none; }");
+    m_fullscreenView->setScene(m_editor->getScene());
 }
 
 QString MainWindow::getDolphinFilename()
 {
-    return dolphinFilename;
+    return m_dolphinFilename;
 }
 
 void MainWindow::setDolphinFilename(const QString &filename)
 {
-    dolphinFilename = filename;
+    m_dolphinFilename = filename;
 }
 
 void MainWindow::on_actionFullscreen_triggered() const
 {
-    if (fullscreenDlg->isVisible()) {
-        fullscreenDlg->accept();
+    if (m_fullscreenDlg->isVisible()) {
+        m_fullscreenDlg->accept();
     } else {
-        fullscreenDlg->showFullScreen();
-        fullscreenDlg->exec();
+        m_fullscreenDlg->showFullScreen();
+        m_fullscreenDlg->exec();
     }
 }
 
 void MainWindow::autoSave()
 {
     COMMENT("Starting autosave.", 0);
-    if (editor->getUndoStack()->isClean()) {
+    if (m_editor->getUndoStack()->isClean()) {
         COMMENT("Undo stack is clean.", 0);
-        if (autosaveFile.exists()) {
-            autosaveFile.remove();
+        if (m_autosaveFile.exists()) {
+            m_autosaveFile.remove();
             m_settings->setAutoSaveFile(QStringLiteral(""));
         }
     } else {
-        if (autosaveFile.exists()) {
-            autosaveFile.remove();
-            if (!currentFile.fileName().isEmpty()) {
+        if (m_autosaveFile.exists()) {
+            m_autosaveFile.remove();
+            if (!m_currentFile.fileName().isEmpty()) {
                 QDir autosavePath(QDir::temp());
                 COMMENT("Autosave path set to the current file's directory, if there is one.", 0);
-                autosavePath = currentFile.dir();
+                autosavePath = m_currentFile.dir();
                 COMMENT("Autosavepath: " << autosavePath.absolutePath().toStdString(), 0);
-                autosaveFile.setFileTemplate(autosavePath.absoluteFilePath(currentFile.baseName() + "XXXXXX.panda"));
-                COMMENT("Setting current file to: " << currentFile.absoluteFilePath().toStdString(), 0);
+                m_autosaveFile.setFileTemplate(autosavePath.absoluteFilePath(m_currentFile.baseName() + "XXXXXX.panda"));
+                COMMENT("Setting current file to: " << m_currentFile.absoluteFilePath().toStdString(), 0);
             } else {
                 COMMENT("Default value not set yet.", 0);
                 QDir autosavePath(QDir::temp());
                 COMMENT("Autosavepath: " << autosavePath.absolutePath().toStdString(), 0);
-                autosaveFile.setFileTemplate(autosavePath.absoluteFilePath("XXXXXX.panda"));
+                m_autosaveFile.setFileTemplate(autosavePath.absoluteFilePath("XXXXXX.panda"));
                 COMMENT("Setting current file to random file in tmp.", 0);
             }
         }
-        if (autosaveFile.open()) {
-            QDataStream ds(&autosaveFile);
-            QString autosaveFilename = autosaveFile.fileName();
+        if (m_autosaveFile.open()) {
+            QDataStream ds(&m_autosaveFile);
+            QString autosaveFilename = m_autosaveFile.fileName();
             // qDebug( ) << "File saved to " << autosaveFilename;
             m_settings->setAutoSaveFile(autosaveFilename);
             try {
-                editor->save(ds, dolphinFilename);
+                m_editor->save(ds, m_dolphinFilename);
             } catch (std::runtime_error &e) {
                 std::cerr << tr("Error autosaving project: ").toStdString() << e.what() << std::endl;
-                autosaveFile.close();
-                autosaveFile.remove();
+                m_autosaveFile.close();
+                m_autosaveFile.remove();
                 m_settings->setAutoSaveFile(QStringLiteral(""));
             }
-            autosaveFile.close();
+            m_autosaveFile.close();
         }
     }
     COMMENT("Finished autosave.", 0);
@@ -998,20 +1000,20 @@ void MainWindow::autoSave()
 
 void MainWindow::on_actionMute_triggered()
 {
-    editor->mute(ui->actionMute->isChecked());
+    m_editor->mute(m_ui->actionMute->isChecked());
 }
 
 void MainWindow::on_actionLabels_under_icons_triggered(bool checked)
 {
-    checked ? ui->mainToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon) : ui->mainToolBar->setToolButtonStyle(Qt::ToolButtonIconOnly);
+    checked ? m_ui->mainToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon) : m_ui->mainToolBar->setToolButtonStyle(Qt::ToolButtonIconOnly);
 }
 
 void MainWindow::on_actionSave_Local_Project_triggered()
 {
-    QString fname = currentFile.absoluteFilePath();
-    QString path = defaultDirectory.absolutePath();
-    if (!currentFile.fileName().isEmpty()) {
-        path = currentFile.absoluteFilePath();
+    QString fname = m_currentFile.absoluteFilePath();
+    QString path = m_defaultDirectory.absolutePath();
+    if (!m_currentFile.fileName().isEmpty()) {
+        path = m_currentFile.absoluteFilePath();
     }
     fname = QFileDialog::getSaveFileName(this, tr("Save Local Project"), path, tr("Panda files (*.panda)"));
     if (fname.isEmpty()) {
@@ -1023,21 +1025,23 @@ void MainWindow::on_actionSave_Local_Project_triggered()
     setCurrentFile(QFileInfo(fname));
     COMMENT("Saving ics and skins", 0);
     // Saves ics ans skins locally here.
-    path = currentFile.absolutePath();
+    path = m_currentFile.absolutePath();
     if (!QDir(path + "/boxes").exists()) {
         bool dir_res = QDir().mkpath(path + "/boxes");
-        if (!dir_res)
+        if (!dir_res) {
             std::cerr << tr("Error creating ICs directory.").toStdString() << std::endl;
     }
+    }
     if (!QDir(path + "/skins").exists()) {
         bool dir_res = QDir().mkpath(path + "/skins");
-        if (!dir_res)
+        if (!dir_res) {
             std::cerr << tr("Error creating skins directory.").toStdString() << std::endl;
     }
+    }
     COMMENT("Saving ics and skins to local directories.", 0);
-    if (!editor->saveLocal(path)) {
+    if (!m_editor->saveLocal(path)) {
         std::cerr << tr("Error saving ICs.").toStdString() << std::endl;
-        ui->statusBar->showMessage(tr("Could not save the local project."), 2000);
+        m_ui->statusBar->showMessage(tr("Could not save the local project."), 2000);
         return;
     }
     COMMENT("Saving main project.", 0);
diff --git a/app/mainwindow.h b/app/mainwindow.h
index a1a8cba65..a5b5d4043 100644
--- a/app/mainwindow.h
+++ b/app/mainwindow.h
@@ -84,9 +84,6 @@ class MainWindow : public QMainWindow
 
     WPandaSettings *settings();
 
-    QDialog *fullscreenDlg;
-    GraphicsView *fullscreenView;
-
 signals:
     void addRecentIcFile(const QString &fname);
     void addRecentFile(const QString &fname);
@@ -158,25 +155,29 @@ private slots:
     void on_actionSave_Local_Project_triggered();
 
 private:
-    Ui::MainWindow *ui;
-    Editor *editor;
-    QFileInfo currentFile;
-    QDir defaultDirectory;
-    QUndoView *undoView;
-    Label *firstResult;
-    bool loadedAutosave;
-    QString autosaveFilename;
-    QString dolphinFilename;
-    BewavedDolphin *bd;
-
-    QTemporaryFile autosaveFile;
-
-    QAction *undoAction;
-    QAction *redoAction;
-    RecentFilesController *rfController, *ricController;
-    QAction *recentFileActs[RecentFilesController::MaxRecentFiles];
-    QTranslator *translator;
-    QVector<ListItemWidget *> boxItemWidgets, searchItemWidgets;
+    Ui::MainWindow *m_ui;
+    Editor *m_editor;
+    QFileInfo m_currentFile;
+    QDir m_defaultDirectory;
+    QUndoView *m_undoView;
+    Label *m_firstResult;
+    bool m_loadedAutosave;
+    QString m_autosaveFilename;
+    QString m_dolphinFilename;
+    BewavedDolphin *m_bd;
+    QDialog *m_fullscreenDlg;
+    GraphicsView *m_fullscreenView;
+
+    QTemporaryFile m_autosaveFile;
+
+    QAction *m_undoAction;
+    QAction *m_redoAction;
+    RecentFilesController *m_rfController;
+    RecentFilesController *m_ricController;
+    QAction *m_recentFileActs[RecentFilesController::MaxRecentFiles];
+    QTranslator *m_translator;
+    QVector<ListItemWidget *> m_boxItemWidgets;
+    QVector<ListItemWidget *> m_searchItemWidgets;
     WPandaSettings *m_settings;
     void createRecentFileActions();
     void populateLeftMenu();