diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtLogView.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtLogView.cpp
index 8768b58a2a..8bd070ea3d 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtLogView.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtLogView.cpp
@@ -1,121 +1,122 @@
 /*=========================================================================
  
 Program:   BlueBerry Platform
 Language:  C++
 Date:      $Date$
 Version:   $Revision$
  
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
  
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
  
 =========================================================================*/
 
 #ifdef __MINGW32__
 // We need to inlclude winbase.h here in order to declare
 // atomic intrinsics like InterlockedIncrement correctly.
 // Otherwhise, they would be declared wrong within qatomic_windows.h .
 #include <windows.h>
 #endif
 
 #include "berryQtLogView.h"
 
 #include "berryQtLogPlugin.h"
 
 #include <berryIPreferencesService.h>
 #include <berryIBerryPreferences.h>
 #include <berryPlatform.h>
 #include <berryPlatformUI.h>
 
 #include <QHeaderView>
 
 #include <QTimer>
 
 namespace berry {
 
 QtLogView::QtLogView(QWidget *parent)
     : QWidget(parent)
 {
   berry::IPreferencesService::Pointer prefService
     = berry::Platform::GetServiceRegistry()
     .GetServiceById<berry::IPreferencesService>(berry::IPreferencesService::ID);
   berry::IBerryPreferences::Pointer prefs
       = (prefService->GetSystemPreferences()->Node("org_blueberry_ui_qt_log"))
         .Cast<berry::IBerryPreferences>();
   
   bool showAdvancedFields = 
       prefs->GetBool("ShowAdvancedFields", true) ;
 
   ui.setupUi(this);
   
   model = QtLogPlugin::GetInstance()->GetLogModel();
   model->SetShowAdvancedFiels( showAdvancedFields );
   
   filterModel = new QSortFilterProxyModel(this);
   filterModel->setSourceModel(model);
   filterModel->setFilterKeyColumn(-1);
 
   ui.tableView->setModel(filterModel);
 
   ui.tableView->verticalHeader()->setVisible(false);
+  ui.tableView->horizontalHeader()->setStretchLastSection(true);
              
   connect( ui.filterContent, SIGNAL( textChanged( const QString& ) ), this, SLOT( slotFilterChange( const QString& ) ) );
   connect( filterModel, SIGNAL( rowsInserted ( const QModelIndex &, int, int ) ), this, SLOT( slotRowAdded( const QModelIndex &, int , int  ) ) );
   ui.ShowAdvancedFields->setChecked( showAdvancedFields );
            
 }
 
 QtLogView::~QtLogView()
 {
 }
 
 void QtLogView::slotScrollDown( )
 {
   ui.tableView->scrollToBottom();
 }
 
 void QtLogView::slotFilterChange( const QString& q )
 {
   filterModel->setFilterRegExp(QRegExp(q, Qt::CaseInsensitive, QRegExp::FixedString));
 }
 
 void QtLogView::slotRowAdded ( const QModelIndex &  /*parent*/, int start, int end )
 {
   static int first=false;
 
   if(!first)
   {
     first=true;
     ui.tableView->resizeColumnsToContents();
     ui.tableView->resizeRowsToContents();
   }
   else
     for(int r=start;r<=end;r++)
     {
       ui.tableView->resizeRowToContents(r);
     }
 
   QTimer::singleShot(0,this,SLOT( slotScrollDown() ) );
 }
 
 void QtLogView::on_ShowAdvancedFields_clicked( bool checked )
 {
-  QtLogPlugin::GetInstance()->GetLogModel()->SetShowAdvancedFiels( checked );
+  QtLogPlugin::GetInstance()->GetLogModel()->SetShowAdvancedFiels( checked );  
   ui.tableView->resizeColumnsToContents();
-  
+
   berry::IPreferencesService::Pointer prefService
     = berry::Platform::GetServiceRegistry()
     .GetServiceById<berry::IPreferencesService>(berry::IPreferencesService::ID);
   berry::IBerryPreferences::Pointer prefs
       = (prefService->GetSystemPreferences()->Node("org_blueberry_ui_qt_log"))
         .Cast<berry::IBerryPreferences>();
   
   prefs->PutBool("ShowAdvancedFields", checked);
   prefs->Flush();
 }
 
 }
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtPlatformLogModel.cpp b/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtPlatformLogModel.cpp
index 625b44912b..ea99140315 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtPlatformLogModel.cpp
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt.log/src/internal/berryQtPlatformLogModel.cpp
@@ -1,313 +1,331 @@
 /*=========================================================================
 
 Program:   BlueBerry Platform
 Language:  C++
 Date:      $Date$
 Version:   $Revision$
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
 #ifdef __MINGW32__
 // We need to inlclude winbase.h here in order to declare
 // atomic intrinsics like InterlockedIncrement correctly.
 // Otherwhise, they would be declared wrong within qatomic_windows.h .
 #include <windows.h>
 #endif
 
 #include "berryQtPlatformLogModel.h"
 
 #include "berryPlatform.h"
 #include "event/berryPlatformEvents.h"
 
 #include <sstream>
 #include <string>
 #include <iostream>
 #include <iomanip>
 
 #include <Poco/Message.h>
 #include "berryLog.h"
 #include <QTimer>
 #include <QIcon>
 
 namespace berry {
 
 const QString QtPlatformLogModel::Error = QString("Error");
-const QString QtPlatformLogModel::Warn = QString("Warn");
+const QString QtPlatformLogModel::Warn = QString("Warning");
 const QString QtPlatformLogModel::Fatal = QString("Fatal");
 const QString QtPlatformLogModel::Info = QString("Info");
 const QString QtPlatformLogModel::Debug = QString("Debug");
 
 void QtPlatformLogModel::slotFlushLogEntries()
 {
   m_Mutex.lock();
   std::list<ExtendedLogMessage> *tmp=m_Active;
   m_Active=m_Pending; m_Pending=tmp;
   m_Mutex.unlock();
 
   int num = static_cast<int>(m_Pending->size());
   
   if (num > 0)
   {
     int row = static_cast<int>(m_Entries.size());
     this->beginInsertRows(QModelIndex(), row, row+num-1);
     do {
       m_Entries.push_back(m_Pending->front());
       m_Pending->pop_front();
     } while(--num);
     this->endInsertRows();
   }
 }
 
 void QtPlatformLogModel::addLogEntry(const mbilog::LogMessage &msg)
 {
   m_Mutex.lock();
   mbilog::BackendCout::FormatSmart(msg);
   m_Active->push_back(ExtendedLogMessage(msg));
   m_Mutex.unlock();
 
   emit signalFlushLogEntries();
 }
 
 void
 QtPlatformLogModel::SetShowAdvancedFiels( bool showAdvancedFiels )
 {
   if( m_ShowAdvancedFiels != showAdvancedFiels )
   {
     m_ShowAdvancedFiels = showAdvancedFiels;
     this->reset();
   }
 }
 
 void
 QtPlatformLogModel::addLogEntry(const PlatformEvent& event)
 {
   const Poco::Message& entry = Poco::RefAnyCast<const Poco::Message>(*event.GetData());
   mbilog::LogMessage msg(mbilog::Info,"n/a",-1,"n/a");
   msg.message += entry.getText();
   msg.category = "BlueBerry."+entry.getSource();
   msg.moduleName = "n/a";
   addLogEntry(msg);
 }
 
 QtPlatformLogModel::QtPlatformLogModel(QObject* parent) : QAbstractTableModel(parent), m_ShowAdvancedFiels(true)
 {
   m_Active=new std::list<ExtendedLogMessage>;
   m_Pending=new std::list<ExtendedLogMessage>;
   connect(this, SIGNAL(signalFlushLogEntries()), this, SLOT( slotFlushLogEntries() ), Qt::QueuedConnection );  
   Platform::GetEvents().logged += PlatformEventDelegate(this, &QtPlatformLogModel::addLogEntry);
   myBackend = new QtLogBackend(this);
 }
 
 QtPlatformLogModel::~QtPlatformLogModel()
 {
   disconnect(this, SIGNAL(signalFlushLogEntries()), this, SLOT( slotFlushLogEntries() ));
   
   // dont delete and unregister backend, only deactivate it to avoid thread syncronization issues cause mbilog::UnregisterBackend is not threadsafe 
   // will be fixed.
   //  delete myBackend;
   //  delete m_Active;
   //  delete m_Pending;
   m_Mutex.lock();
   myBackend->Deactivate();
   m_Mutex.unlock();
 }
 
 // QT Binding
 
 int
 QtPlatformLogModel::rowCount(const QModelIndex&) const
 {
   return static_cast<int>(m_Entries.size());
 }
 
 int
 QtPlatformLogModel::columnCount(const QModelIndex&) const
 {
   if( m_ShowAdvancedFiels )
     return 8;
   else
     return 2;
 }
           /*
   struct LogEntry {
     LogEntry(const std::string& msg, const std::string& src, std::time_t t)
     : message(msg.c_str()), moduleName(src.c_str()),time(std::clock())
     { 
     }
 
     QString message;
     clock_t time;
 
     QString level;
     QString filePath;
     QString lineNumber;
     QString moduleName;
     QString category;
     QString function;
     
     LogEntry(const mbilog::LogMessage &msg)
     {
       message = msg.message.c_str();
       
                                                            
       filePath = msg.filePath;
             
       std::stringstream out;
       out << msg.lineNumber;
       lineNumber = out.str().c_str();
       
       moduleName = msg.moduleName;
       category = msg.category.c_str();
       function = msg.functionName;
       
       time=std::clock(); 
     }
   };        */
 
 
 QVariant
 QtPlatformLogModel::data(const QModelIndex& index, int role) const
 {
   const ExtendedLogMessage *msg = &m_Entries[index.row()]; 
   if (role == Qt::DisplayRole)
   {
     if( m_ShowAdvancedFiels )
     {
       switch (index.column()) {
       
         case 0: {
           std::stringstream ss;
           std::locale C("C");
           ss.imbue(C);
           ss << std::setw(7) << std::setprecision(3) << std::fixed << ((double)msg->time)/CLOCKS_PER_SEC;
           return QVariant(QString(ss.str().c_str()));
         }
         
         case 1: 
           {
             // change muellerm, an icon is returned do not return text
-            return QVariant(QString(""));
-            /*
             switch(msg->message.level)
             {
               default:
               case mbilog::Info:
                 return QVariant(Info);
 
               case mbilog::Warn:
                 return QVariant(Warn);
                 
               case mbilog::Error:
                 return QVariant(Error);
                 
               case mbilog::Fatal:
                 return QVariant(Fatal);
                 
               case mbilog::Debug:
                 return QVariant(Debug);
             }
-            */
           }
           
         case 2: 
           return QVariant(QString(msg->message.message.c_str()));
           
         case 3: 
           return QVariant(QString(msg->message.category.c_str()));
       
         case 4: 
           return QVariant(QString(msg->message.moduleName));
       
         case 5: 
           return QVariant(QString(msg->message.functionName));
       
         case 6: 
           return QVariant(QString(msg->message.filePath));
       
         case 7: 
         {
           std::stringstream out;
           std::locale C("C");
           out.imbue(C);
           out << msg->message.lineNumber;
           return QVariant(QString(out.str().c_str()));
         }
       }
     }
     else // m_ShowAdvancedFields
     {
       // only return text
+      if( index.column() == 0 )
+      {
+        switch(msg->message.level)
+        {
+          default:
+          case mbilog::Info:
+            return QVariant(Info);
+
+          case mbilog::Warn:
+            return QVariant(Warn);
+
+          case mbilog::Error:
+            return QVariant(Error);
+
+          case mbilog::Fatal:
+            return QVariant(Fatal);
+
+          case mbilog::Debug:
+            return QVariant(Debug);
+        }
+      }
       if( index.column()==1 )
       {
         return QVariant(QString(msg->message.message.c_str()));
       }
     }
   }
   else if(  role == Qt::DecorationRole )
   {
     if ( (m_ShowAdvancedFiels && index.column()==1)
       || (!m_ShowAdvancedFiels && index.column()==0) )
     {
       QString file ( ":/org_blueberry_ui_qt_log/information.png" );
 
       if( msg->message.level == mbilog::Error )
         file = ":/org_blueberry_ui_qt_log/error.png";
       else if( msg->message.level == mbilog::Warn )
         file = ":/org_blueberry_ui_qt_log/warning.png";
       else if( msg->message.level == mbilog::Debug )
         file = ":/org_blueberry_ui_qt_log/debug.png";
       else if( msg->message.level == mbilog::Fatal )
         file = ":/org_blueberry_ui_qt_log/fatal.png";
 
       QIcon icon(file);
       return QVariant(icon);
 
     }
   }
 
 
   return QVariant();
 }
 
 QVariant
 QtPlatformLogModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
   if (role == Qt::DisplayRole && orientation == Qt::Horizontal)
   {
     if( m_ShowAdvancedFiels )
     {
       switch (section) 
       {
         case 0: return QVariant("Time");
         case 1: return QVariant("Level");
         case 2: return QVariant("Message");
         case 3: return QVariant("Category");
         case 4: return QVariant("Module");
         case 5: return QVariant("Function");
         case 6: return QVariant("File");
         case 7: return QVariant("Line");
       }
     }
     else
     {
       switch (section) 
       {
         case 0: return QVariant("Severtiy");
         case 1: return QVariant("Message");
       }
     }
   }
 
   return QVariant();
 }
 
 
 }