diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp
index 32d9b211..30e3e1d7 100644
--- a/src/board/UBBoardController.cpp
+++ b/src/board/UBBoardController.cpp
@@ -1132,11 +1132,11 @@ void UBBoardController::setActiveDocumentScene(UBDocumentProxy* pDocumentProxy,
         UBGraphicsTextItem::lastUsedTextColor = QColor();
     }
 
-    if (sceneChange)
-        emit activeSceneChanged();
-
     // Notify the navigator palette that the document has changed
     mPaletteManager->navigatorPalette()->setDocument(pDocumentProxy);
+
+    if (sceneChange)
+        emit activeSceneChanged();
 }
 
 
diff --git a/src/domain/UBGraphicsTextItemDelegate.cpp b/src/domain/UBGraphicsTextItemDelegate.cpp
index fa32f86d..1db3b905 100644
--- a/src/domain/UBGraphicsTextItemDelegate.cpp
+++ b/src/domain/UBGraphicsTextItemDelegate.cpp
@@ -58,7 +58,8 @@ void UBGraphicsTextItemDelegate::contentsChanged()
     delegated()->contentsChanged();
 }
 
-
+// This method is used to filter the available fonts. Only the web-compliant fonts
+// will remain in the font list.
 void UBGraphicsTextItemDelegate::customize(QFontDialog &fontDialog)
 {
     fontDialog.setOption(QFontDialog::DontUseNativeDialog);
diff --git a/src/gui/UBDocumentNavigator.cpp b/src/gui/UBDocumentNavigator.cpp
index d6a418be..7678ec28 100644
--- a/src/gui/UBDocumentNavigator.cpp
+++ b/src/gui/UBDocumentNavigator.cpp
@@ -91,7 +91,7 @@ void UBDocumentNavigator::generateThumbnails()
 	QGraphicsPixmapItem* pixmapItem = new UBSceneThumbnailPixmap(pix, mCrntDoc, i);
 
 	// Get the selected item
-	if(UBApplication::boardController->activeSceneIndex() == i)
+        if(UBApplication::boardController->activeSceneIndex() == i)
 	{
 	    selection = pixmapItem;
 	    mCrntItem = dynamic_cast<UBSceneThumbnailPixmap*>(pixmapItem);
@@ -152,10 +152,10 @@ void UBDocumentNavigator::addNewPage()
 {
     if(!bNavig)
     {
-	generateThumbnails();
+        generateThumbnails();
 	if(NULL != mCrntItem)
 	{
-	    mCrntItem->setSelected(true);
+            mCrntItem->setSelected(true);
 	}
     }
 }
diff --git a/src/transition/UniboardSankoreTransition.cpp b/src/transition/UniboardSankoreTransition.cpp
index def11929..d2336a0a 100644
--- a/src/transition/UniboardSankoreTransition.cpp
+++ b/src/transition/UniboardSankoreTransition.cpp
@@ -7,20 +7,25 @@
 
 UniboardSankoreTransition::UniboardSankoreTransition(QObject *parent) :
     QObject(parent)
+  , mTransitionDlg(NULL)
 {
-    mOldSankoreDirectory = UBFileSystemUtils::normalizeFilePath(UBDesktopServices::storageLocation(QDesktopServices::DataLocation));
+//    mOldSankoreDirectory = UBFileSystemUtils::normalizeFilePath(UBDesktopServices::storageLocation(QDesktopServices::DataLocation));
 
-    mUniboardSourceDirectory = UBFileSystemUtils::normalizeFilePath(UBDesktopServices::storageLocation(QDesktopServices::DataLocation));
-#if defined(Q_WS_MACX)
-    mUniboardSourceDirectory.replace("Sankore/Sankore 3.1", "Uniboard");
-#else
-    mUniboardSourceDirectory.replace("Sankore/Sankore 3.1", "Mnemis/Uniboard");
-#endif
-    connect(this, SIGNAL(docAdded(UBDocumentProxy*)), UBPersistenceManager::persistenceManager(), SIGNAL(documentCreated(UBDocumentProxy*)));
+//    mUniboardSourceDirectory = UBFileSystemUtils::normalizeFilePath(UBDesktopServices::storageLocation(QDesktopServices::DataLocation));
+//#if defined(Q_WS_MACX)
+//    mUniboardSourceDirectory.replace("Sankore/Sankore 3.1", "Uniboard");
+//#else
+//    mUniboardSourceDirectory.replace("Sankore/Sankore 3.1", "Mnemis/Uniboard");
+//#endif
+//    connect(this, SIGNAL(docAdded(UBDocumentProxy*)), UBPersistenceManager::persistenceManager(), SIGNAL(documentCreated(UBDocumentProxy*)));
 }
 UniboardSankoreTransition::~UniboardSankoreTransition()
 {
-    delete mTransitionDlg;
+    if(NULL != mTransitionDlg)
+    {
+        delete mTransitionDlg;
+        mTransitionDlg = NULL;
+    }
 }
 
 void UniboardSankoreTransition::rollbackDocumentsTransition(QFileInfoList& fileInfoList)