diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp
index 5bc5653d..b6509eb5 100644
--- a/src/board/UBBoardController.cpp
+++ b/src/board/UBBoardController.cpp
@@ -351,7 +351,6 @@ void UBBoardController::connectToolbar()
     connect(mMainWindow->actionEraseItems, SIGNAL(triggered()), this, SLOT(clearSceneItems()));
     connect(mMainWindow->actionEraseAnnotations, SIGNAL(triggered()), this, SLOT(clearSceneAnnotation()));
 
-    //connect(mMainWindow->actionUndo, SIGNAL(triggered()), this, SLOT(stopScript()));
     connect(mMainWindow->actionUndo, SIGNAL(triggered()), UBApplication::undoStack, SLOT(undo()));
     connect(mMainWindow->actionRedo, SIGNAL(triggered()), UBApplication::undoStack, SLOT(redo()));
     connect(mMainWindow->actionRedo, SIGNAL(triggered()), this, SLOT(startScript()));
@@ -669,8 +668,6 @@ void UBBoardController::zoom(const qreal ratio, QPointF scenePoint)
 
 void UBBoardController::handScroll(qreal dx, qreal dy)
 {
-//    mControlView->horizontalScrollBar()->setValue(mControlView->horizontalScrollBar()->value() - dx);
-//    mControlView->verticalScrollBar()->setValue(mControlView->verticalScrollBar()->value() - dy);
     mControlView->translate(dx, dy);
 	
     UBApplication::applicationController->adjustDisplayView();
diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp
index de59f778..ea309afe 100644
--- a/src/core/UBApplication.cpp
+++ b/src/core/UBApplication.cpp
@@ -322,7 +322,8 @@ int UBApplication::exec(const QString& pFileToImport)
 #endif
     if (UBSettings::settings()->appStartMode->get() == "Desktop")
         applicationController->showDesktop();
-    else applicationController->showBoard();
+    else
+        applicationController->showBoard();
 
 
     if (UBSettings::settings()->appIsInSoftwareUpdateProcess->get().toBool())
@@ -543,16 +544,16 @@ void UBApplication::updateProtoActionsState()
 void UBApplication::insertSpaceToToolbarBeforeAction(QToolBar* toolbar, QAction* action, int width)
 {
     QWidget* spacer = new QWidget();
-    QHBoxLayout *layout = new QHBoxLayout();
 
-    if (width >= 0)
+    if (width >= 0){
+        QHBoxLayout *layout = new QHBoxLayout();
         layout->addSpacing(width);
+        spacer->setLayout(layout);
+    }
     else
-        layout->addStretch();
+        spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
 
-    spacer->setLayout(layout);
     toolbar->insertWidget(action, spacer);
-
 }
 
 
diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp
index e2e09375..9eec23a8 100644
--- a/src/core/UBApplicationController.cpp
+++ b/src/core/UBApplicationController.cpp
@@ -172,6 +172,7 @@ void UBApplicationController::screenLayoutChanged()
 void UBApplicationController::adaptToolBar()
 {
     bool highResolution = mMainWindow->width() > 1024;
+
     mMainWindow->actionClearPage->setVisible(Board == mMainMode && highResolution);
     mMainWindow->actionBoard->setVisible(Board != mMainMode || highResolution);
     mMainWindow->actionDocument->setVisible(Document != mMainMode || highResolution);
diff --git a/src/web/UBWebController.cpp b/src/web/UBWebController.cpp
index aae76119..ca46e500 100644
--- a/src/web/UBWebController.cpp
+++ b/src/web/UBWebController.cpp
@@ -128,9 +128,7 @@ void UBWebController::webBrowserInstance()
 
             WBBrowserWindow::downloadManager()->setParent((*mCurrentWebBrowser), Qt::Tool);
 
-            UBApplication::app()->insertSpaceToToolbarBeforeAction(mMainWindow->webToolBar,
-                                                                   mMainWindow->actionBoard, 32);
-
+            UBApplication::app()->insertSpaceToToolbarBeforeAction(mMainWindow->webToolBar, mMainWindow->actionBoard, 32);
             UBApplication::app()->decorateActionMenu(mMainWindow->actionMenu);
 
             bool showAddBookmarkButtons = UBSettings::settings()->webShowAddBookmarkButton->get().toBool();
@@ -151,8 +149,6 @@ void UBWebController::webBrowserInstance()
 
             (*mCurrentWebBrowser)->tabWidget()->tabBar()->show();
             (*mCurrentWebBrowser)->tabWidget()->lineEdits()->show();
-//            (*mCurrentWebBrowser)->tabWidget()->tabBar()->hide();
-//            (*mCurrentWebBrowser)->tabWidget()->lineEdits()->hide();
         }
 
         UBApplication::applicationController->setMirrorSourceWidget((*mCurrentWebBrowser)->paintWidget());