diff --git a/source/app/PropertiesSidebar.cpp b/source/app/PropertiesSidebar.cpp
index 890729f..1344f87 100644
--- a/source/app/PropertiesSidebar.cpp
+++ b/source/app/PropertiesSidebar.cpp
@@ -56,6 +56,7 @@ StreamPropertiesSideBar::StreamPropertiesSideBar( QWidget* parent ) :
   QLabel *streamNameLabel = new QLabel( tr( "Name:" ) );
   streamNameLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
   labelNameValue = new QLabel;
+  labelNameValue->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) );
   labelNameValue->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
 
   QLabel *formatLabel = new QLabel( tr( "File Format:" ) );
@@ -88,6 +89,9 @@ StreamPropertiesSideBar::StreamPropertiesSideBar( QWidget* parent ) :
 
   QGridLayout *propertiesLayout = new QGridLayout;
   Int layout_line = 0;
+//  propertiesLayout->addWidget( streamNameLabel, layout_line, 0 );
+//  propertiesLayout->addWidget( labelNameValue, layout_line, 1 );
+//  layout_line++;
   propertiesLayout->addWidget( formatLabel, layout_line, 0 );
   propertiesLayout->addWidget( labelFormatValue, layout_line, 1 );
   layout_line++;
@@ -150,7 +154,7 @@ Void StreamPropertiesSideBar::setData( PlaYUVerStream* pcStream )
     setEnabled( true );
 
 
-    labelNameValue->setText( m_pcStream->getFileName() );
+    labelNameValue->setText( QFileInfo( m_pcStream->getFileName() ).fileName() );
     labelFormatValue->setText( m_pcStream->getFormatName() );
     labelCodecValue->setText( m_pcStream->getCodecName() );
     Int duration[3];
diff --git a/source/app/plaYUVerApp.cpp b/source/app/plaYUVerApp.cpp
index 2b74012..1b49d55 100644
--- a/source/app/plaYUVerApp.cpp
+++ b/source/app/plaYUVerApp.cpp
@@ -53,6 +53,7 @@ plaYUVerApp::plaYUVerApp()
   setCentralWidget( mdiArea );
   //mdiArea->setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded );
   //mdiArea->setVerticalScrollBarPolicy( Qt::ScrollBarAsNeeded );
+  mdiArea->setActivationOrder( QMdiArea::ActivationHistoryOrder );
 
   connect( mdiArea, SIGNAL( subWindowActivated(QMdiSubWindow*) ), this, SLOT( chageSubWindowSelection() ) );
 
@@ -878,6 +879,7 @@ Void plaYUVerApp::chageSubWindowSelection()
     if( activeSubWindow() )
     {
       m_pcCurrentSubWindow = new_window;
+      setWindowTitle( QApplication::applicationName() + " - " + m_pcCurrentSubWindow->getWindowName() );
       if( !plaYUVerApp::findSubWindow( mdiArea, m_pcCurrentSubWindow->getRefSubWindow() ) )
       {
         m_pcCurrentSubWindow->setRefSubWindow( NULL );