diff --git a/app/views/main/_file_row.php b/app/views/main/_file_row.php
index 3ee4f50..9ece384 100644
--- a/app/views/main/_file_row.php
+++ b/app/views/main/_file_row.php
@@ -1,9 +1,12 @@
-<?php if ($_COOKIE['ui-switch'] == 'simple'): ?>
-<?php else: ?>
-<div class="file-description">
+<?php 
+  if ($_COOKIE['ui-switch'] == 'simple') 
+    $simple = true;
+  else $simple = false;
+?>
+<div class="file-description <?php echo $simple?'no-indent':'' ?>">
   <img src="<?php echo get_mimetype_icon_url ($file->getMimetype ()) ?>"
-    class="mimetype" />
-  <p class="filename">
+    class="mimetype <?php echo $simple?'mimetype-simple':''?>" />
+  <p class="filename <?php echo $simple?'small-filename':'' ?>">
     <a href="<?php echo $file->getDownloadUrl () ?>">
       <?php echo h (truncate_string ($file->file_name, 40)) ?>
     </a>
@@ -14,50 +17,79 @@ class="mimetype" />
   <p class="has-password"><?php echo ($file->password ? 1 : 0)?></p>
   <p class="available-from"><?php echo $file->available_from; ?></p>
   <p class="available-until"><?php echo $file->available_until; ?></p>
-  <p class="filesize">(<?php echo $file->getReadableFileSize () ?>)</p>
+  <p class="<?php echo $simple?'small-filesize':'filesize' ?>">(<?php echo $file->getReadableFileSize () ?>)</p>
+  <p class="<?php echo $simple?'availability-simple':'availability-hide'?>">
+    <?php
+    echo __r('%from% to %to%', array ('from' =>
+      $file->getAvailableFrom()->toString(option ('localeDateFormat')),
+      'to' => '<b>'.$file->getAvailableUntil ()->toString (
+      option ('localeDateFormat')).'</b>')
+    );
+    ?>
+  </p>
+  <p class="<?php echo $simple?'filefolder-simple':'filefolder-hide'?>">
+    <?php
+    if (isset($file->folder) && $file->folder != '') {
+      echo __('Folder') .': ';
+      echo a(array(
+      'href'  => $file->getDownloadFolderUrl ($fz_user->id),
+      'id'    => '',
+      'class' => '',
+      'title' => __('Open folder contents')),
+      $file->folder);
+    } else {
+      echo __('No folder assigned');
+    }
+    ?>
+  </p>
   <p class="deletelink"><?php echo $file->getDownloadUrl()?>/delete</p>
   <?php
   if (fz_config_get ('app', 'enable_copy_to_clipboard', true)) {
-    echo '  <p class="zclip">';
+    if ($simple == true)
+      echo '<p class="zclip-simple">';
+    else
+      echo '<p class="zclip">';
+    $zclipButtonStyle = $simple?'zclip zclip-simple':'awesome blue zclip';
     echo a(array(
     'href'  => $file->getDownloadUrl () . '/copy',
     'id'    => '',
-    'class' => 'awesome blue zclip',
+    'class' => $zclipButtonStyle,
     'title' => __('Copy download link to clipboard')),
     __('Copy to clipboard'));
     echo '</p>';
   }
   ?>
-  <p class="share">
+  <p class="<?php echo $simple?'share-simple':'share'?>">
   <?php
+  $shareButtonStyles = $simple?'share share-simple':'awesome green share';
   echo a(array(
   'href'  => $file->getDownloadUrl () . '/share',
   'id'    => '',
-  'class' => 'awesome green share',
+  'class' => $shareButtonStyles,
   'title' => __('Share file with others')),
   __('Share'));
   ?>
   </p>
 </div>
 
-<div class="file-attributes file-folder">
-    <p class="filefolder">
-      <?php
-      if (isset($file->folder) && $file->folder != '') {
-        echo __('Folder') .': ';
-        echo a(array(
-        'href'  => $file->getDownloadFolderUrl ($fz_user->id),
-        'id'    => '',
-        'class' => '',
-        'title' => __('Open folder contents')),
-        $file->folder);
-      } else {
-        echo __('No folder assigned');
-      }
-      ?>
-    </p>
+<?php if (!$simple): ?>
+<div class="file-attributes file-folder <?php echo $simple?'folder-simple':''?>">
+  <p class="filefolder">
+    <?php
+    if (isset($file->folder) && $file->folder != '') {
+      echo __('Folder') .': ';
+      echo a(array(
+      'href'  => $file->getDownloadFolderUrl ($fz_user->id),
+      'id'    => '',
+      'class' => '',
+      'title' => __('Open folder contents')),
+      $file->folder);
+    } else {
+      echo __('No folder assigned');
+    }
+    ?>
+  </p>
 </div>
-
 <div class="file-attributes">
   <p class="availability">
   <?php
@@ -83,13 +115,14 @@ class="mimetype" />
     }
     ?>
   </p>
+<?php endif ?>
   <p>
   <?php 
-  
+  $editButtonClass = $simple?'edit edit-simple':'edit';
   echo a(array(
   'href'  => $file->getDownloadUrl () . '/edit',
   'id'    => '',
-  'class' => 'edit',
+  'class' => $editButtonClass,
   'title' => __('Edit')),
   __('Edit'));
   
@@ -100,4 +133,3 @@ class="mimetype" />
   </p>
   </div>
 </div>
-<?php endif ?>
\ No newline at end of file
diff --git a/app/views/main/index.php b/app/views/main/index.php
index add3ee0..66db99e 100644
--- a/app/views/main/index.php
+++ b/app/views/main/index.php
@@ -125,7 +125,8 @@ class="awesome blue large" value="&raquo; <?php echo __('Upload') ?>" />
 <section id="uploaded-files">
   <ul id="files">
     <?php $odd = true; foreach ($files as $file): ?>
-      <li class="file <?php echo $odd ? 'odd' : 'even'; $odd = ! $odd ?>"
+      <li class="file <?php echo $odd ? 'odd' : 'even'; $odd = ! $odd ?>
+        <?php echo $_COOKIE['ui-switch'] == 'simple' ? 'simple-file' : ''?>"
         id="<?php echo 'file-'.$file->getHash() ?>">
         <?php echo partial ('main/_file_row.php', array ('file' => $file)) ?> 
       </li>
diff --git a/i18n/de/LC_MESSAGES/default.mo b/i18n/de/LC_MESSAGES/default.mo
index 7f22aa7..e05733d 100644
Binary files a/i18n/de/LC_MESSAGES/default.mo and b/i18n/de/LC_MESSAGES/default.mo differ
diff --git a/i18n/de/LC_MESSAGES/default.po b/i18n/de/LC_MESSAGES/default.po
index 7a97adc..dda975a 100644
--- a/i18n/de/LC_MESSAGES/default.po
+++ b/i18n/de/LC_MESSAGES/default.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: filez-2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-16 16:50+0100\n"
-"PO-Revision-Date: 2011-12-16 16:50+0100\n"
+"POT-Creation-Date: 2011-12-20 12:39+0100\n"
+"PO-Revision-Date: 2011-12-20 12:55+0100\n"
 "Last-Translator: Dennis Bruenig <dennisbruenig1983@googlemail.com>\n"
 "Language-Team: Universität Hildesheim <arnaud.didry@univ-avignon.fr>\n"
 "MIME-Version: 1.0\n"
@@ -441,10 +441,11 @@ msgstr "und der Universität Hildesheim"
 msgid "Imprint"
 msgstr "Impressum"
 
-#: C:\htdocs\filez/app/views/layout/_header.php:13
+#: C:\htdocs\filez/app/views/layout/_header.php:12
 msgid "Share files for a limited time."
 msgstr "Share files for a limited time."
 
+#: C:\htdocs\filez/app/views/layout/_header.php:29
 #: C:\htdocs\filez/app/views/layout/_header.php:31
 msgid "Find help"
 msgstr "Hilfe"
@@ -466,12 +467,12 @@ msgid "Log out"
 msgstr "Abmelden"
 
 #: C:\htdocs\filez/app/views/main/index.php:9
-#: C:\htdocs\filez/app/views/main/index.php:293
+#: C:\htdocs\filez/app/views/main/index.php:295
 msgid "Upload a new file"
 msgstr "Eine neue Datei hochladen"
 
 #: C:\htdocs\filez/app/views/main/index.php:16
-#: C:\htdocs\filez/app/views/main/index.php:161
+#: C:\htdocs\filez/app/views/main/index.php:162
 msgid "File (Max size: %size%):"
 msgstr "Datei (maximale Dateigröße %size%):"
 
@@ -488,42 +489,42 @@ msgid "Select a starting date"
 msgstr "Wählen Sie das Startdatum"
 
 #: C:\htdocs\filez/app/views/main/index.php:30
-#: C:\htdocs\filez/app/views/main/index.php:174
+#: C:\htdocs\filez/app/views/main/index.php:175
 msgid "Available until:"
 msgstr "Verfügbar bis:"
 
 #: C:\htdocs\filez/app/views/main/index.php:33
-#: C:\htdocs\filez/app/views/main/index.php:177
+#: C:\htdocs\filez/app/views/main/index.php:178
 msgid "Select a ending date"
 msgstr "Wählen Sie ein Enddatum."
 
 #: C:\htdocs\filez/app/views/main/index.php:42
-#: C:\htdocs\filez/app/views/main/index.php:186
+#: C:\htdocs\filez/app/views/main/index.php:187
 msgid "Assign file to folder (optional):"
 msgstr "Datei einem Ordner zuweisen (optional):"
 
 #: C:\htdocs\filez/app/views/main/index.php:44
-#: C:\htdocs\filez/app/views/main/index.php:188
+#: C:\htdocs\filez/app/views/main/index.php:189
 msgid "Assign file to folder (optional)"
 msgstr "Datei einem Ordner zuweisen (optional)"
 
 #: C:\htdocs\filez/app/views/main/index.php:50
-#: C:\htdocs\filez/app/views/main/index.php:193
+#: C:\htdocs\filez/app/views/main/index.php:194
 msgid "Ask a password to people who will download your file"
 msgstr "Passwort zum Schutz der Datei verwenden"
 
 #: C:\htdocs\filez/app/views/main/index.php:52
-#: C:\htdocs\filez/app/views/main/index.php:195
+#: C:\htdocs\filez/app/views/main/index.php:196
 msgid "Use a password to download"
 msgstr "Passwort zum Download erforderlich"
 
 #: C:\htdocs\filez/app/views/main/index.php:60
-#: C:\htdocs\filez/app/views/main/index.php:215
+#: C:\htdocs\filez/app/views/main/index.php:216
 msgid "Require the user to login to grant access to your file."
 msgstr "Der Benutzer muss eingeloggt sein, um die Datei downloaden zu können."
 
 #: C:\htdocs\filez/app/views/main/index.php:63
-#: C:\htdocs\filez/app/views/main/index.php:217
+#: C:\htdocs\filez/app/views/main/index.php:218
 msgid "Require login"
 msgstr "Download erfordert Login"
 
@@ -569,146 +570,150 @@ msgstr "Verfügbare Dateien"
 msgid "Used folders:"
 msgstr "Verwendete Ordner:"
 
-#: C:\htdocs\filez/app/views/main/index.php:138
+#: C:\htdocs\filez/app/views/main/index.php:139
 msgid "Give this link to the person you want to share this file with"
 msgstr "Geben Sie diese Adresse an die Personen weiter, mit denen Sie Ihre Datei teilen möchten"
 
-#: C:\htdocs\filez/app/views/main/index.php:141
+#: C:\htdocs\filez/app/views/main/index.php:142
 msgid "or share using:"
 msgstr "oder verteilen Sie den Link über:"
 
-#: C:\htdocs\filez/app/views/main/index.php:144
+#: C:\htdocs\filez/app/views/main/index.php:145
 msgid "your email"
 msgstr "E-Mail"
 
-#: C:\htdocs\filez/app/views/main/index.php:148
+#: C:\htdocs\filez/app/views/main/index.php:149
 msgid "Facebook"
 msgstr "Facebook"
 
-#: C:\htdocs\filez/app/views/main/index.php:151
+#: C:\htdocs\filez/app/views/main/index.php:152
 msgid "Twitter"
 msgstr "Twitter"
 
-#: C:\htdocs\filez/app/views/main/index.php:165
+#: C:\htdocs\filez/app/views/main/index.php:166
 msgid "Replace file"
 msgstr "Datei ersetzen"
 
-#: C:\htdocs\filez/app/views/main/index.php:169
+#: C:\htdocs\filez/app/views/main/index.php:170
 msgid "Starts from:"
 msgstr "Startdatum:"
 
-#: C:\htdocs\filez/app/views/main/index.php:199
-#: C:\htdocs\filez/app/views/main/index.php:201
-#: C:\htdocs\filez/app/views/main/index.php:206
+#: C:\htdocs\filez/app/views/main/index.php:200
+#: C:\htdocs\filez/app/views/main/index.php:202
+#: C:\htdocs\filez/app/views/main/index.php:207
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: C:\htdocs\filez/app/views/main/index.php:224
-#: C:\htdocs\filez/app/views/main/_file_row.php:91
-#: C:\htdocs\filez/app/views/main/_file_row.php:92
+#: C:\htdocs\filez/app/views/main/index.php:225
+#: C:\htdocs\filez/app/views/main/_file_row.php:112
+#: C:\htdocs\filez/app/views/main/_file_row.php:113
 #: C:\htdocs\filez/app/views/user/index.php:35
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: C:\htdocs\filez/app/views/main/index.php:262
+#: C:\htdocs\filez/app/views/main/index.php:264
 msgid "Are you sure to delete this file ?"
 msgstr "Möchten Sie diese Datei wirklich löschen?"
 
-#: C:\htdocs\filez/app/views/main/index.php:263
+#: C:\htdocs\filez/app/views/main/index.php:265
 msgid "Do you want to toggle on login requirement for this file?"
 msgstr "Möchten Sie die Loginanforderung für dise Datei anschalten?"
 
-#: C:\htdocs\filez/app/views/main/index.php:264
+#: C:\htdocs\filez/app/views/main/index.php:266
 msgid "Do you want to toggle off login requirement for this file ?"
 msgstr "Möchten Sie die Loginanforderung für diese Datei aussschalten?"
 
-#: C:\htdocs\filez/app/views/main/index.php:265
+#: C:\htdocs\filez/app/views/main/index.php:267
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: C:\htdocs\filez/app/views/main/index.php:266
+#: C:\htdocs\filez/app/views/main/index.php:268
 msgid "An unknown error hapenned while uploading the file"
 msgstr "Beim Hochladen der Datei ist ein unbekannter Fehler aufgetreten"
 
-#: C:\htdocs\filez/app/views/main/index.php:267
+#: C:\htdocs\filez/app/views/main/index.php:269
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: C:\htdocs\filez/app/views/main/index.php:268
+#: C:\htdocs\filez/app/views/main/index.php:270
 msgid "You can download the file I uploaded here"
 msgstr "Hier können Sie die hochgeladenen Datei herunterladen"
 
-#: C:\htdocs\filez/app/views/main/index.php:269
+#: C:\htdocs\filez/app/views/main/index.php:271
 msgid "Edit file"
 msgstr "Datei bearbeiten"
 
-#: C:\htdocs\filez/app/views/main/index.php:270
+#: C:\htdocs\filez/app/views/main/index.php:272
 msgid "Copied to clipboard"
 msgstr "Link kopiert"
 
-#: C:\htdocs\filez/app/views/main/index.php:271
+#: C:\htdocs\filez/app/views/main/index.php:273
 msgid "You have to accept the user agreement to upload the file."
 msgstr "Sie müssen der Benutzervereinbarung zustimmen, um die Datei hochzuladen."
 
-#: C:\htdocs\filez/app/views/main/index.php:272
+#: C:\htdocs\filez/app/views/main/index.php:274
 msgid "Please set a download protection password or deselect the appropriate checkbox."
 msgstr "Bitte geben Sie ein Download-Passwort ein oder deselektieren Sie die entsprechende Checkbox."
 
-#: C:\htdocs\filez/app/views/main/index.php:273
-#: C:\htdocs\filez/app/views/main/_file_row.php:53
+#: C:\htdocs\filez/app/views/main/index.php:275
+#: C:\htdocs\filez/app/views/main/_file_row.php:63
 msgid "No folder assigned"
 msgstr "Keinem Ordner zugewiesen"
 
-#: C:\htdocs\filez/app/views/main/index.php:274
-#: C:\htdocs\filez/app/views/main/_file_row.php:45
+#: C:\htdocs\filez/app/views/main/index.php:276
+#: C:\htdocs\filez/app/views/main/_file_row.php:55
 msgid "Folder"
 msgstr "Ordner"
 
-#: C:\htdocs\filez/app/views/main/index.php:353
+#: C:\htdocs\filez/app/views/main/index.php:355
 msgid "You have entered a date after the end date. Please use the date picker to select a date."
 msgstr "Sie haben ein Datum angegeben, das vor dem Enddatum liegt. Bitte verwenden Sie die Datumsauswahl um ein gültiges Datum zu wählen."
 
-#: C:\htdocs\filez/app/views/main/index.php:380
+#: C:\htdocs\filez/app/views/main/index.php:382
 msgid "You have entered a date before the start date. Please use the date picker to select a date."
 msgstr "Sie haben ein Datum angegeben, das vor dem Startdatum liegt. Bitte verwenden Sie die Datumsauswahl um ein gültiges Datum zu wählen."
 
-#: C:\htdocs\filez/app/views/main/index.php:384
+#: C:\htdocs\filez/app/views/main/index.php:386
 msgid "You have entered a date which is longer than six months in the future. Please use the date picker to select a date."
 msgstr "Sie haben ein Datum angegeben, das mehr als 6 Monate ind er Zukunft liegt. Bitte verwenden Sie die Datumsauswahl um ein gültiges Datum zu wählen."
 
-#: C:\htdocs\filez/app/views/main/index.php:395
+#: C:\htdocs\filez/app/views/main/index.php:397
 msgid "You have to give at least a password or require a login."
 msgstr "Sie müssen mindestens ein Passwort vergeben oder den Login für die Datei erfordern."
 
-#: C:\htdocs\filez/app/views/main/_file_row.php:24
+#: C:\htdocs\filez/app/views/main/_file_row.php:33
 msgid "Copy download link to clipboard"
 msgstr "Download-Link in die Zwischenablage kopieren"
 
-#: C:\htdocs\filez/app/views/main/_file_row.php:25
+#: C:\htdocs\filez/app/views/main/_file_row.php:34
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage"
 
-#: C:\htdocs\filez/app/views/main/_file_row.php:35
+#: C:\htdocs\filez/app/views/main/_file_row.php:45
 msgid "Share file with others"
 msgstr "Datei mit anderen teilen"
 
-#: C:\htdocs\filez/app/views/main/_file_row.php:36
+#: C:\htdocs\filez/app/views/main/_file_row.php:46
 msgid "Share"
 msgstr "Link anzeigen"
 
-#: C:\htdocs\filez/app/views/main/_file_row.php:50
+#: C:\htdocs\filez/app/views/main/_file_row.php:60
 msgid "Open folder contents"
 msgstr "Ordner-Inhalt anzeigen"
 
-#: C:\htdocs\filez/app/views/main/_file_row.php:73
+#: C:\htdocs\filez/app/views/main/_file_row.php:71
+msgid "%from% to %to%"
+msgstr "%from% - %to%"
+
+#: C:\htdocs\filez/app/views/main/_file_row.php:93
 msgid "Never downloaded"
 msgstr "Noch nie heruntergeladen"
 
-#: C:\htdocs\filez/app/views/main/_file_row.php:76
+#: C:\htdocs\filez/app/views/main/_file_row.php:96
 msgid "Downloaded once"
 msgstr "Einmal heruntergeladen"
 
-#: C:\htdocs\filez/app/views/main/_file_row.php:79
+#: C:\htdocs\filez/app/views/main/_file_row.php:99
 msgid "Download %x% times"
 msgstr "%x%-mal heruntergeladen"
 
diff --git a/i18n/en/LC_MESSAGES/default.mo b/i18n/en/LC_MESSAGES/default.mo
index ba8fb78..02a4d49 100644
Binary files a/i18n/en/LC_MESSAGES/default.mo and b/i18n/en/LC_MESSAGES/default.mo differ
diff --git a/i18n/en/LC_MESSAGES/default.po b/i18n/en/LC_MESSAGES/default.po
index 2d1571a..17780b8 100644
--- a/i18n/en/LC_MESSAGES/default.po
+++ b/i18n/en/LC_MESSAGES/default.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: filez-2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-16 17:20+0100\n"
-"PO-Revision-Date: 2011-12-16 17:30+0100\n"
+"POT-Creation-Date: 2011-12-20 12:39+0100\n"
+"PO-Revision-Date: 2011-12-20 12:55+0100\n"
 "Last-Translator: Dennis Bruenig <dennisbruenig1983@googlemail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -462,12 +462,12 @@ msgid "Log out"
 msgstr "Log out"
 
 #: C:\htdocs\filez/app/views/main/index.php:9
-#: C:\htdocs\filez/app/views/main/index.php:293
+#: C:\htdocs\filez/app/views/main/index.php:295
 msgid "Upload a new file"
 msgstr "Upload a new file"
 
 #: C:\htdocs\filez/app/views/main/index.php:16
-#: C:\htdocs\filez/app/views/main/index.php:161
+#: C:\htdocs\filez/app/views/main/index.php:162
 msgid "File (Max size: %size%):"
 msgstr "File (Max size: %size%):"
 
@@ -484,42 +484,42 @@ msgid "Select a starting date"
 msgstr "Select a starting date"
 
 #: C:\htdocs\filez/app/views/main/index.php:30
-#: C:\htdocs\filez/app/views/main/index.php:174
+#: C:\htdocs\filez/app/views/main/index.php:175
 msgid "Available until:"
 msgstr "Available until:"
 
 #: C:\htdocs\filez/app/views/main/index.php:33
-#: C:\htdocs\filez/app/views/main/index.php:177
+#: C:\htdocs\filez/app/views/main/index.php:178
 msgid "Select a ending date"
 msgstr "Select a ending date"
 
 #: C:\htdocs\filez/app/views/main/index.php:42
-#: C:\htdocs\filez/app/views/main/index.php:186
+#: C:\htdocs\filez/app/views/main/index.php:187
 msgid "Assign file to folder (optional):"
 msgstr "Assign file to folder (optional):"
 
 #: C:\htdocs\filez/app/views/main/index.php:44
-#: C:\htdocs\filez/app/views/main/index.php:188
+#: C:\htdocs\filez/app/views/main/index.php:189
 msgid "Assign file to folder (optional)"
 msgstr "Assign file to folder (optional)"
 
 #: C:\htdocs\filez/app/views/main/index.php:50
-#: C:\htdocs\filez/app/views/main/index.php:193
+#: C:\htdocs\filez/app/views/main/index.php:194
 msgid "Ask a password to people who will download your file"
 msgstr "Ask a password to people who will download your file"
 
 #: C:\htdocs\filez/app/views/main/index.php:52
-#: C:\htdocs\filez/app/views/main/index.php:195
+#: C:\htdocs\filez/app/views/main/index.php:196
 msgid "Use a password to download"
 msgstr "Use a password to download"
 
 #: C:\htdocs\filez/app/views/main/index.php:60
-#: C:\htdocs\filez/app/views/main/index.php:215
+#: C:\htdocs\filez/app/views/main/index.php:216
 msgid "Require the user to login to grant access to your file."
 msgstr "Require the user to login to grant access to your file."
 
 #: C:\htdocs\filez/app/views/main/index.php:63
-#: C:\htdocs\filez/app/views/main/index.php:217
+#: C:\htdocs\filez/app/views/main/index.php:218
 msgid "Require login"
 msgstr "Require login"
 
@@ -565,146 +565,150 @@ msgstr "Uploaded files"
 msgid "Used folders:"
 msgstr "Used folders:"
 
-#: C:\htdocs\filez/app/views/main/index.php:138
+#: C:\htdocs\filez/app/views/main/index.php:139
 msgid "Give this link to the person you want to share this file with"
 msgstr "Give this link to the person you want to share this file with"
 
-#: C:\htdocs\filez/app/views/main/index.php:141
+#: C:\htdocs\filez/app/views/main/index.php:142
 msgid "or share using:"
 msgstr "or share using:"
 
-#: C:\htdocs\filez/app/views/main/index.php:144
+#: C:\htdocs\filez/app/views/main/index.php:145
 msgid "your email"
 msgstr "your email"
 
-#: C:\htdocs\filez/app/views/main/index.php:148
+#: C:\htdocs\filez/app/views/main/index.php:149
 msgid "Facebook"
 msgstr "Facebook"
 
-#: C:\htdocs\filez/app/views/main/index.php:151
+#: C:\htdocs\filez/app/views/main/index.php:152
 msgid "Twitter"
 msgstr "Twitter"
 
-#: C:\htdocs\filez/app/views/main/index.php:165
+#: C:\htdocs\filez/app/views/main/index.php:166
 msgid "Replace file"
 msgstr "Replace file"
 
-#: C:\htdocs\filez/app/views/main/index.php:169
+#: C:\htdocs\filez/app/views/main/index.php:170
 msgid "Starts from:"
 msgstr "Starts from:"
 
-#: C:\htdocs\filez/app/views/main/index.php:199
-#: C:\htdocs\filez/app/views/main/index.php:201
-#: C:\htdocs\filez/app/views/main/index.php:206
+#: C:\htdocs\filez/app/views/main/index.php:200
+#: C:\htdocs\filez/app/views/main/index.php:202
+#: C:\htdocs\filez/app/views/main/index.php:207
 msgid "Change password"
 msgstr "Change password"
 
-#: C:\htdocs\filez/app/views/main/index.php:224
-#: C:\htdocs\filez/app/views/main/_file_row.php:93
-#: C:\htdocs\filez/app/views/main/_file_row.php:94
+#: C:\htdocs\filez/app/views/main/index.php:225
+#: C:\htdocs\filez/app/views/main/_file_row.php:112
+#: C:\htdocs\filez/app/views/main/_file_row.php:113
 #: C:\htdocs\filez/app/views/user/index.php:35
 msgid "Edit"
 msgstr "Edit"
 
-#: C:\htdocs\filez/app/views/main/index.php:262
+#: C:\htdocs\filez/app/views/main/index.php:264
 msgid "Are you sure to delete this file ?"
 msgstr "Are you sure to delete this file ?"
 
-#: C:\htdocs\filez/app/views/main/index.php:263
+#: C:\htdocs\filez/app/views/main/index.php:265
 msgid "Do you want to toggle on login requirement for this file?"
 msgstr "Do you want to toggle on login requirement for this file?"
 
-#: C:\htdocs\filez/app/views/main/index.php:264
+#: C:\htdocs\filez/app/views/main/index.php:266
 msgid "Do you want to toggle off login requirement for this file ?"
 msgstr "Do you want to toggle off login requirement for this file ?"
 
-#: C:\htdocs\filez/app/views/main/index.php:265
+#: C:\htdocs\filez/app/views/main/index.php:267
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: C:\htdocs\filez/app/views/main/index.php:266
+#: C:\htdocs\filez/app/views/main/index.php:268
 msgid "An unknown error hapenned while uploading the file"
 msgstr "An unknown error hapenned while uploading the file"
 
-#: C:\htdocs\filez/app/views/main/index.php:267
+#: C:\htdocs\filez/app/views/main/index.php:269
 msgid "Cancel"
 msgstr "Cancel"
 
-#: C:\htdocs\filez/app/views/main/index.php:268
+#: C:\htdocs\filez/app/views/main/index.php:270
 msgid "You can download the file I uploaded here"
 msgstr "You can download the file I uploaded here"
 
-#: C:\htdocs\filez/app/views/main/index.php:269
+#: C:\htdocs\filez/app/views/main/index.php:271
 msgid "Edit file"
 msgstr "Edit file"
 
-#: C:\htdocs\filez/app/views/main/index.php:270
+#: C:\htdocs\filez/app/views/main/index.php:272
 msgid "Copied to clipboard"
 msgstr "Copied to clipboard"
 
-#: C:\htdocs\filez/app/views/main/index.php:271
+#: C:\htdocs\filez/app/views/main/index.php:273
 msgid "You have to accept the user agreement to upload the file."
 msgstr "You have to accept the user agreement to upload the file."
 
-#: C:\htdocs\filez/app/views/main/index.php:272
+#: C:\htdocs\filez/app/views/main/index.php:274
 msgid "Please set a download protection password or deselect the appropriate checkbox."
 msgstr "Please set a download protection password or deselect the appropriate checkbox."
 
-#: C:\htdocs\filez/app/views/main/index.php:273
-#: C:\htdocs\filez/app/views/main/_file_row.php:55
+#: C:\htdocs\filez/app/views/main/index.php:275
+#: C:\htdocs\filez/app/views/main/_file_row.php:63
 msgid "No folder assigned"
 msgstr "No folder assigned"
 
-#: C:\htdocs\filez/app/views/main/index.php:274
-#: C:\htdocs\filez/app/views/main/_file_row.php:47
+#: C:\htdocs\filez/app/views/main/index.php:276
+#: C:\htdocs\filez/app/views/main/_file_row.php:55
 msgid "Folder"
 msgstr "Folder"
 
-#: C:\htdocs\filez/app/views/main/index.php:353
+#: C:\htdocs\filez/app/views/main/index.php:355
 msgid "You have entered a date after the end date. Please use the date picker to select a date."
 msgstr "You have entered a date after the end date. Please use the date picker to select a date."
 
-#: C:\htdocs\filez/app/views/main/index.php:380
+#: C:\htdocs\filez/app/views/main/index.php:382
 msgid "You have entered a date before the start date. Please use the date picker to select a date."
 msgstr "You have entered a date before the start date. Please use the date picker to select a date."
 
-#: C:\htdocs\filez/app/views/main/index.php:384
+#: C:\htdocs\filez/app/views/main/index.php:386
 msgid "You have entered a date which is longer than six months in the future. Please use the date picker to select a date."
 msgstr "You have entered a date which is longer than six months in the future. Please use the date picker to select a date."
 
-#: C:\htdocs\filez/app/views/main/index.php:395
+#: C:\htdocs\filez/app/views/main/index.php:397
 msgid "You have to give at least a password or require a login."
 msgstr "You have to give at least a password or require a login."
 
-#: C:\htdocs\filez/app/views/main/_file_row.php:26
+#: C:\htdocs\filez/app/views/main/_file_row.php:33
 msgid "Copy download link to clipboard"
 msgstr "Copy download link to clipboard"
 
-#: C:\htdocs\filez/app/views/main/_file_row.php:27
+#: C:\htdocs\filez/app/views/main/_file_row.php:34
 msgid "Copy to clipboard"
 msgstr "Copy to clipboard"
 
-#: C:\htdocs\filez/app/views/main/_file_row.php:37
+#: C:\htdocs\filez/app/views/main/_file_row.php:45
 msgid "Share file with others"
 msgstr "Share file with others"
 
-#: C:\htdocs\filez/app/views/main/_file_row.php:38
+#: C:\htdocs\filez/app/views/main/_file_row.php:46
 msgid "Share"
 msgstr "Share"
 
-#: C:\htdocs\filez/app/views/main/_file_row.php:52
+#: C:\htdocs\filez/app/views/main/_file_row.php:60
 msgid "Open folder contents"
 msgstr "Open folder contents"
 
-#: C:\htdocs\filez/app/views/main/_file_row.php:75
+#: C:\htdocs\filez/app/views/main/_file_row.php:71
+msgid "%from% to %to%"
+msgstr "%from% to %to%"
+
+#: C:\htdocs\filez/app/views/main/_file_row.php:93
 msgid "Never downloaded"
 msgstr "Never downloaded"
 
-#: C:\htdocs\filez/app/views/main/_file_row.php:78
+#: C:\htdocs\filez/app/views/main/_file_row.php:96
 msgid "Downloaded once"
 msgstr "Downloaded once"
 
-#: C:\htdocs\filez/app/views/main/_file_row.php:81
+#: C:\htdocs\filez/app/views/main/_file_row.php:99
 msgid "Download %x% times"
 msgstr "Download %x% times"
 
diff --git a/resources/css/main.css b/resources/css/main.css
index 69ebb82..c08f6bb 100644
--- a/resources/css/main.css
+++ b/resources/css/main.css
@@ -431,6 +431,11 @@ section#folder-content ul li.file {
     padding-top: 0.7em;
 }
 
+section#uploaded-files ul li.simple-file {
+    position: relative;
+    padding-top: 0em;
+}
+
 section#uploaded-files ul li.file.even,
 section#folder-content ul li.file.even {
     background: #F5F4F2;
@@ -473,6 +478,10 @@ section#folder-content ul li .file-description {
     padding: 0 0 0.2em 64px;
 }
 
+section#uploaded-files ul li .no-indent {
+    padding: 0 0 0.2em 5px;
+}
+
 section#uploaded-files ul li .file-description p,
 section#folder-content ul li .file-description p {
     display: inline;
@@ -489,6 +498,11 @@ section#folder-content ul li p.filename a {
     letter-spacing: -0.05em;
 }
 
+section#uploaded-files ul li p.small-filename a {
+    font-size: 0.8em;
+    letter-spacing: -0.05em;
+}
+
 section#uploaded-files ul li img.mimetype,
 section#folder-content ul li img.mimetype {
     position: absolute;
@@ -496,6 +510,10 @@ section#folder-content ul li img.mimetype {
     left: 1.0em;
 }
 
+section#uploaded-files ul li img.mimetype-simple {
+  display: none;
+}
+
 section#uploaded-files ul li p a.copy2clipboard,
 section#folder-content ul li p a.copy2clipboard {
     opacity: 0;
@@ -528,6 +546,11 @@ section#folder-content ul li .filesize {
     font-size: 0.82em;
 }
 
+section#uploaded-files ul li .small-filesize {
+    color: #B0ABA6;
+    font-size: 0.62em;
+}
+
 section#uploaded-files ul li p.share,
 section#uploaded-files ul li p.zclip,
 section#folder-content ul li p.share {
@@ -547,6 +570,21 @@ section#folder-content ul li p.share a {
     right: 6px;
 }
 
+section#uploaded-files ul li p.share-simple a {
+    text-indent: -20000px;
+    background-image: url(../images/icons/share-this-icon.png);
+    background-repeat: no-repeat;
+    background-color: #019652;
+    position: absolute;
+    top:5px;
+    right:22px;
+    width:16px;
+    height:16px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+}
+
+
 section#uploaded-files ul li p.zclip a {
     background-image: url(../images/icons/copy-this-icon.png);
     background-position: 7px center;
@@ -559,6 +597,18 @@ section#uploaded-files ul li p.zclip a {
     right: 6px;
 }
 
+section#uploaded-files ul li p.zclip-simple a {
+    width: 16px;
+    height: 16px;
+    text-indent:-2000px;
+    background-image: url(../images/icons/copy-this-icon.png);
+    background-repeat: no-repeat;
+    padding: 0px;
+    position: absolute;
+    top: 6px;
+    right: 6px;
+}
+
 /*
  * File attributes
  */
@@ -576,6 +626,13 @@ section#folder-content ul li .file-attributes p + p {
     margin-left: 0.5em;
 }
 
+section#uploaded-files ul li .folder-simple {
+  position: absolute;
+  float: left;
+  padding: 0px;
+  top: 0px;
+}
+
 section#uploaded-files ul li .file-attributes,
 section#folder-content ul li .file-attributes {
     color: #7C746C;
@@ -594,6 +651,36 @@ section#folder-content ul li .file-attributes .availability b {
     color: #433C34;
 }
 
+section#uploaded-files ul li .availability-simple {
+  float: right;
+  padding-top: 2px;
+  padding-right: 65px;
+  font-size: 0.6em;
+}
+
+section#uploaded-files ul li p.availability-hide {
+  display: none;
+}
+
+section#uploaded-files ul li .filefolder-simple {
+  float: right;
+  padding-right: 5px;
+  padding-top: 2px;
+  font-size: 0.7em;
+}
+
+section#uploaded-files ul li p.filefolder-hide {
+  display: none;
+}
+
+
+/*
+section#uploaded-files ul li .availability-simple {
+  position: absolute;
+  top: 0px;
+  font-size: 0.6em;
+}
+*/
 section#uploaded-files ul li a.send-by-email {
     background-image: url(../images/icons/mail-message-new.png);
 }
@@ -616,6 +703,16 @@ section#uploaded-files ul li a.edit {
     display: inline-block;
 }
 
+section#uploaded-files ul li a.edit-simple {
+    position: absolute;
+    top:4px;
+    right: 40px;
+    line-height: 16px;
+    height: 16px;
+    width: 16px;
+    display: inline-block;
+}
+
 section#uploaded-files ul li .file-functions {
   display: inline;
   float: right;
diff --git a/resources/images/icons/system-switch-ui.png b/resources/images/icons/system-switch-ui.png
new file mode 100644
index 0000000..84348f3
Binary files /dev/null and b/resources/images/icons/system-switch-ui.png differ