diff --git a/part/infopanel.cpp b/part/infopanel.cpp
index c452c75d..d93a0b36 100644
--- a/part/infopanel.cpp
+++ b/part/infopanel.cpp
@@ -1,201 +1,211 @@
 /*
  * ark -- archiver for the KDE project
  *
  * Copyright (C) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
 #include "infopanel.h"
 #include "ark_debug.h"
 #include "kerfuffle/archive_kerfuffle.h"
 
 #include <QLabel>
 #include <QVBoxLayout>
 #include <QFileInfo>
 #include <QMimeDatabase>
 
 #include <KLocalizedString>
 #include <KIconLoader>
 #include <kio/global.h>
 
 using namespace Kerfuffle;
 
 static QPixmap getDesktopIconForName(const QString& name)
 {
     return QIcon::fromTheme(name).pixmap(IconSize(KIconLoader::Desktop), IconSize(KIconLoader::Desktop));
 }
 
 InfoPanel::InfoPanel(ArchiveModel *model, QWidget *parent)
         : QFrame(parent), m_model(model)
 {
     setupUi(this);
 
     // Make the file name font bigger than the rest
     QFont fnt = fileName->font();
     if (fnt.pointSize() > -1) {
         fnt.setPointSize(fnt.pointSize() + 1);
     } else {
         fnt.setPixelSize(fnt.pixelSize() + 3);
     }
     fileName->setFont(fnt);
 
     updateWithDefaults();
 }
 
 InfoPanel::~InfoPanel()
 {
 }
 
 void InfoPanel::updateWithDefaults()
 {
     iconLabel->setPixmap(getDesktopIconForName(QStringLiteral("utilities-file-archiver")));
 
     const QString currentFileName = prettyFileName();
 
     if (currentFileName.isEmpty()) {
         fileName->setText(i18n("No archive loaded"));
     } else {
         fileName->setText(currentFileName);
     }
 
     additionalInfo->setText(QString());
     hideMetaData();
 }
 
 QString InfoPanel::prettyFileName() const
 {
     if (m_prettyFileName.isEmpty()) {
         if (m_model->archive()) {
             QFileInfo fileInfo(m_model->archive()->fileName());
             return fileInfo.fileName();
         }
     }
 
     return m_prettyFileName;
 }
 
 void InfoPanel::setPrettyFileName(const QString& fileName)
 {
     m_prettyFileName = fileName;
 }
 
 void InfoPanel::setIndex(const QModelIndex& index)
 {
     if (!index.isValid()) {
         updateWithDefaults();
     } else {
         const ArchiveEntry& entry = m_model->entryForIndex(index);
 
         QMimeDatabase db;
         QMimeType mimeType;
         if (entry[ IsDirectory ].toBool()) {
             mimeType = db.mimeTypeForName(QStringLiteral("inode/directory"));
         } else {
             mimeType = db.mimeTypeForFile(entry[ FileName ].toString(), QMimeDatabase::MatchExtension);
         }
 
         iconLabel->setPixmap(getDesktopIconForName(mimeType.iconName()));
         if (entry[ IsDirectory ].toBool()) {
             int dirs;
             int files;
             const int children = m_model->childCount(index, dirs, files);
             additionalInfo->setText(KIO::itemsSummaryString(children, files, dirs, 0, false));
         } else if (entry.contains(Link)) {
             additionalInfo->setText(i18n("Symbolic Link"));
         } else {
             if (entry.contains(Size)) {
                 additionalInfo->setText(KIO::convertSize(entry[ Size ].toULongLong()));
             } else {
                 additionalInfo->setText(i18n("Unknown size"));
 
             }
         }
 
         const QStringList nameParts = entry[ FileName ].toString().split(QLatin1Char( '/' ), QString::SkipEmptyParts);
         const QString name = (nameParts.count() > 0) ? nameParts.last() : entry[ FileName ].toString();
         fileName->setText(name);
 
-        metadataLabel->setText(metadataTextFor(index));
-        showMetaData();
+        showMetaDataFor(index);
     }
 }
 
 void InfoPanel::setIndexes(const QModelIndexList &list)
 {
     if (list.size() == 0) {
         setIndex(QModelIndex());
     } else if (list.size() == 1) {
         setIndex(list[ 0 ]);
     } else {
         iconLabel->setPixmap(getDesktopIconForName(QStringLiteral("utilities-file-archiver")));
         fileName->setText(i18np("One file selected", "%1 files selected", list.size()));
         quint64 totalSize = 0;
         foreach(const QModelIndex& index, list) {
             const ArchiveEntry& entry = m_model->entryForIndex(index);
             totalSize += entry[ Size ].toULongLong();
         }
         additionalInfo->setText(KIO::convertSize(totalSize));
         hideMetaData();
     }
 }
 
 void InfoPanel::showMetaData()
 {
     m_separator->show();
-    metadataLabel->show();
+    m_metaDataWidget->show();
 }
 
 void InfoPanel::hideMetaData()
 {
     m_separator->hide();
-    metadataLabel->hide();
+    m_metaDataWidget->hide();
 }
 
-QString InfoPanel::metadataTextFor(const QModelIndex &index)
+void InfoPanel::showMetaDataFor(const QModelIndex &index)
 {
+    showMetaData();
+
     const ArchiveEntry& entry = m_model->entryForIndex(index);
-    QString text;
 
     QMimeDatabase db;
     QMimeType mimeType;
 
     if (entry[ IsDirectory ].toBool()) {
         mimeType = db.mimeTypeForName(QStringLiteral("inode/directory"));
     } else {
         mimeType = db.mimeTypeForFile(entry[FileName].toString(), QMimeDatabase::MatchExtension);
     }
 
-    text += i18n("<b>Type:</b> %1<br/>",  mimeType.comment());
+    m_typeLabel->setText(i18n("<b>Type:</b> %1",  mimeType.comment()));
 
     if (entry.contains(Owner)) {
-        text += i18n("<b>Owner:</b> %1<br/>", entry[ Owner ].toString());
+        m_ownerLabel->show();
+        m_ownerLabel->setText(i18n("<b>Owner:</b> %1", entry[Owner].toString()));
+    } else {
+        m_ownerLabel->hide();
     }
 
     if (entry.contains(Group)) {
-        text += i18n("<b>Group:</b> %1<br/>", entry[ Group ].toString());
+        m_groupLabel->show();
+        m_groupLabel->setText(i18n("<b>Group:</b> %1", entry[Group].toString()));
+    } else {
+        m_groupLabel->hide();
     }
 
     if (entry.contains(Link)) {
-        text += i18n("<b>Target:</b> %1<br/>", entry[ Link ].toString());
+        m_targetLabel->show();
+        m_targetLabel->setText(i18n("<b>Target:</b> %1", entry[Link].toString()));
+    } else {
+        m_targetLabel->hide();
     }
 
     if (entry.contains(IsPasswordProtected) && entry[ IsPasswordProtected ].toBool()) {
-        text += i18n("<b>Password protected:</b> Yes<br/>");
+        m_passwordLabel->show();
+        m_passwordLabel->setText(i18n("<b>Password protected:</b> Yes"));
+    } else {
+        m_passwordLabel->hide();
     }
-
-    return text;
 }
diff --git a/part/infopanel.h b/part/infopanel.h
index bc2cdf7c..b0be79a8 100644
--- a/part/infopanel.h
+++ b/part/infopanel.h
@@ -1,73 +1,73 @@
 /*
  * ark -- archiver for the KDE project
  *
  * Copyright (C) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
 #ifndef INFOPANEL_H
 #define INFOPANEL_H
 
 #include "kerfuffle/archive_kerfuffle.h"
 #include "archivemodel.h"
 #include "ui_infopanel.h"
 
 #include <QFrame>
 
 class InfoPanel: public QFrame, Ui::InformationPanel
 {
     Q_OBJECT
 public:
     explicit InfoPanel(ArchiveModel *model, QWidget *parent = 0);
     virtual ~InfoPanel();
 
     void setIndex(const QModelIndex &);
     void setIndexes(const QModelIndexList &list);
 
     /**
      * Returns the file name that is displayed on the info panel.
      *
      * @return The current file name. If no pretty name has been
      *         set, it returns the name of the loaded archive.
      */
     QString prettyFileName() const;
 
     /**
      * Sets a different file name for the current open archive.
      *
      * This is particularly useful when a temporary archive (from
      * a remote location) is loaded, and the window title shows the
      * remote file name and the info panel, by default, would show
      * the name of the temporary downloaded file.
      *
      * @param fileName The new file name.
      */
     void setPrettyFileName(const QString& fileName);
 
     void updateWithDefaults();
 
 private:
     void showMetaData();
     void hideMetaData();
 
-    QString metadataTextFor(const QModelIndex &);
+    void showMetaDataFor(const QModelIndex &index);
 
     ArchiveModel *m_model;
     QString m_prettyFileName;
 };
 
 #endif // INFOPANEL_H
diff --git a/part/infopanel.ui b/part/infopanel.ui
index 1c8c477a..c9ac5eac 100644
--- a/part/infopanel.ui
+++ b/part/infopanel.ui
@@ -1,121 +1,146 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>InformationPanel</class>
  <widget class="QWidget" name="InformationPanel">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>140</width>
     <height>300</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="windowTitle">
    <string>Information Panel</string>
   </property>
   <layout class="QVBoxLayout">
    <item>
     <widget class="QLabel" name="iconLabel">
      <property name="text">
       <string/>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>
      </property>
      <property name="textInteractionFlags">
       <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
      </property>
     </widget>
    </item>
    <item>
     <widget class="KSqueezedTextLabel" name="fileName">
      <property name="font">
       <font>
        <weight>75</weight>
        <bold>true</bold>
       </font>
      </property>
      <property name="text">
       <string notr="true">KSqueezedTextLabel</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>
      <property name="textInteractionFlags">
       <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
      </property>
      <property name="textElideMode">
       <enum>Qt::ElideRight</enum>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QLabel" name="additionalInfo">
      <property name="text">
       <string>Unknown file type</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>
      </property>
      <property name="textInteractionFlags">
       <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
      </property>
     </widget>
    </item>
    <item>
     <widget class="Line" name="m_separator">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="metadataLabel">
-     <property name="text">
-      <string>Metadata Label</string>
-     </property>
-     <property name="margin">
-      <number>10</number>
-     </property>
-     <property name="indent">
-      <number>20</number>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-     </property>
+    <widget class="QWidget" name="m_metaDataWidget" native="true">
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QLabel" name="m_typeLabel">
+        <property name="text">
+         <string notr="true">Type</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="m_ownerLabel">
+        <property name="text">
+         <string notr="true">Owner</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="m_groupLabel">
+        <property name="text">
+         <string notr="true">Group</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="KSqueezedTextLabel" name="m_targetLabel">
+        <property name="text">
+         <string notr="true">Target</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="m_passwordLabel">
+        <property name="text">
+         <string notr="true">Password</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
    <item>
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KSqueezedTextLabel</class>
    <extends>QLabel</extends>
    <header>ksqueezedtextlabel.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>