diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp
index 3962ce5f..63909a60 100644
--- a/src/board/UBBoardPaletteManager.cpp
+++ b/src/board/UBBoardPaletteManager.cpp
@@ -775,7 +775,7 @@ void UBBoardPaletteManager::addItem(const QPixmap& pPixmap, const QPointF& pos,
     mPos = pos;
     mScaleFactor = scaleFactor;
 
-     QRect controlGeo = UBApplication::applicationController->displayManager()->controlGeometry();
+    QRect controlGeo = UBApplication::applicationController->displayManager()->controlGeometry();
 
     mAddItemPalette->show();
     mAddItemPalette->adjustSizeAndPosition();
diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp
index 11945435..4ccd470e 100644
--- a/src/core/UBApplication.cpp
+++ b/src/core/UBApplication.cpp
@@ -325,31 +325,31 @@ int UBApplication::exec(const QString& pFileToImport)
         applicationController->showBoard();
 
 
-    if (UBSettings::settings()->appIsInSoftwareUpdateProcess->get().toBool())
-    {
-        UBSettings::settings()->appIsInSoftwareUpdateProcess->set(false);
+//    if (UBSettings::settings()->appIsInSoftwareUpdateProcess->get().toBool())
+//    {
+//        UBSettings::settings()->appIsInSoftwareUpdateProcess->set(false);
 
-        // clean potential updater in temp directory
-        UBFileSystemUtils::cleanupGhostTempFolders();
+//        // clean potential updater in temp directory
+//        UBFileSystemUtils::cleanupGhostTempFolders();
 
-        QUuid docUuid( UBSettings::settings()->appLastSessionDocumentUUID->get().toString());
+//        QUuid docUuid( UBSettings::settings()->appLastSessionDocumentUUID->get().toString());
 
-        if (!docUuid.isNull())
-        {
-            UBDocumentProxy* proxy = UBPersistenceManager::persistenceManager()->documentByUuid(docUuid);
+//        if (!docUuid.isNull())
+//        {
+//            UBDocumentProxy* proxy = UBPersistenceManager::persistenceManager()->documentByUuid(docUuid);
 
-            if (proxy)
-            {
-                bool ok;
-                int lastSceneIndex = UBSettings::settings()->appLastSessionPageIndex->get().toInt(&ok);
+//            if (proxy)
+//            {
+//                bool ok;
+//                int lastSceneIndex = UBSettings::settings()->appLastSessionPageIndex->get().toInt(&ok);
 
-                if (!ok)
-                    lastSceneIndex = 0;
+//                if (!ok)
+//                    lastSceneIndex = 0;
 
-                boardController->setActiveDocumentScene(proxy, lastSceneIndex);
-            }
-        }
-    }
+//                boardController->setActiveDocumentScene(proxy, lastSceneIndex);
+//            }
+//        }
+//    }
 
 
 
diff --git a/src/core/UBDisplayManager.cpp b/src/core/UBDisplayManager.cpp
index 1d441adb..a76a3e76 100644
--- a/src/core/UBDisplayManager.cpp
+++ b/src/core/UBDisplayManager.cpp
@@ -147,6 +147,8 @@ void UBDisplayManager::setDisplayWidget(QWidget* pDisplayWidget)
     if(pDisplayWidget && (pDisplayWidget != mDisplayWidget))
     {
         mDisplayWidget = pDisplayWidget;
+        mDisplayWidget->setGeometry(mDesktop->screenGeometry(mDisplayScreenIndex));
+        mDisplayWidget->showFullScreen();
 		// !!!! Should be included into Windows after QT recompilation
 #ifdef Q_WS_MAC
 //        mDisplayWidget->setAttribute(Qt::WA_MacNoShadow);
diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp
index 56540a46..a5f6048c 100644
--- a/src/desktop/UBDesktopAnnotationController.cpp
+++ b/src/desktop/UBDesktopAnnotationController.cpp
@@ -69,7 +69,6 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
     mTransparentDrawingView = new UBBoardView(UBApplication::boardController, 0); // deleted in UBDesktopAnnotationController::destructor
 
     mTransparentDrawingView->setAttribute(Qt::WA_TranslucentBackground, true);
-	// !!!! Should be included into Windows after QT recompilation
 #ifdef Q_WS_MAC
     mTransparentDrawingView->setAttribute(Qt::WA_MacNoShadow, true);
 #endif
@@ -111,8 +110,7 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
     connect(mTransparentDrawingView, SIGNAL(resized(QResizeEvent*)), this, SLOT(onTransparentWidgetResized()));
 
 
-    connect(UBDrawingController::drawingController(), SIGNAL(stylusToolChanged(int))
-            , this, SLOT(stylusToolChanged(int)));
+    connect(UBDrawingController::drawingController(), SIGNAL(stylusToolChanged(int)), this, SLOT(stylusToolChanged(int)));
 
     // Add the desktop associated palettes
     mDesktopPenPalette = new UBDesktopPenPalette(mTransparentDrawingView);
@@ -147,39 +145,11 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent)
 
 #ifdef Q_WS_X11
     connect(mDesktopPalette, SIGNAL(moving()), this, SLOT(refreshMask()));
-//    connect(mRightPalette, SIGNAL(resized()), this, SLOT(refreshMask()));
     connect(UBApplication::boardController->paletteManager()->rightPalette(), SIGNAL(resized()), this, SLOT(refreshMask()));
 #endif
     onDesktopPaletteMaximized();
 }
 
-// void UBDesktopAnnotationController::showKeyboard(bool show)
-// {
-//     #ifdef Q_WS_X11
-//         if (!mTransparentDrawingView->isVisible())
-//             return;
-//     #endif
-// 
-//     if(mKeyboardPalette)
-//     {
-//         if(show)
-//             UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector);
-//         mKeyboardPalette->setVisible(show);
-// 
-//         #ifdef Q_WS_X11
-//             updateMask(true);
-//         #endif
-//         
-//     }
-// 
-// }
-
-// void UBDesktopAnnotationController::showKeyboard()
-// {
-//     if (UBApplication::mainWindow->actionVirtualKeyboard->isChecked())
-//         mKeyboardPalette->show();
-// }
-
 UBDesktopAnnotationController::~UBDesktopAnnotationController()
 {
     delete mTransparentDrawingScene;
diff --git a/src/web/UBWebController.cpp b/src/web/UBWebController.cpp
index 46afc1fa..676656e8 100644
--- a/src/web/UBWebController.cpp
+++ b/src/web/UBWebController.cpp
@@ -32,7 +32,6 @@
 #include "network/UBNetworkAccessManager.h"
 
 #include "gui/UBWidgetMirror.h"
-#include "gui/UBScreenMirror.h"
 #include "gui/UBMainWindow.h"
 #include "gui/UBWebToolsPalette.h"
 #include "gui/UBKeyboardPalette.h"
diff --git a/src/web/UBWebController.h b/src/web/UBWebController.h
index 1636826a..2d1fd9ce 100644
--- a/src/web/UBWebController.h
+++ b/src/web/UBWebController.h
@@ -23,7 +23,6 @@
 
 class WBBrowserWindow;
 class UBApplication;
-class UBScreenMirror;
 class UBTrapFlashController;
 class UBMainWindow;
 class UBWebToolsPalette;