diff --git a/inc/js/photosphere/sphere.js b/inc/js/photosphere/sphere.js
index 742b0a9..2305c01 100644
--- a/inc/js/photosphere/sphere.js
+++ b/inc/js/photosphere/sphere.js
@@ -13,7 +13,7 @@ function Photosphere(image){
 }
 
 Photosphere.prototype.loadPhotosphere = function(holder){
-	holder.innerHTML = "wait...";
+	holder.innerHTML = "<div id='loading_spin'><img src='inc/spiffygif.gif' alt='Loading...'></div>";
 	
 	this.holder = holder;
 
diff --git a/inc/loc/default.ini b/inc/loc/default.ini
index 6addf33..2563e98 100644
--- a/inc/loc/default.ini
+++ b/inc/loc/default.ini
@@ -1,31 +1,42 @@
 [settings]
 settings	= "Settings"
+global		= "Global"
 title 		= "Title"
 site_address= "Site root URL"
 buttons 	= "Buttons"
+s_networks	= "Social Networks"
 fb 			= "Facebook"
 facebook_appid 	= "Facebook Application ID"
 fbappid 	= "AppID"
 plusone 	= "Google +1"
 register 	= "Register"
+options		= "Options"
 noregister 	= "Block Registration"
 forcehttps 	= "Force https for login and registration"
 comment		= "Comments"
 nocomment	= "Remove Comments Panel"
 download	= "Downloads"
+nocomments	= "Remove comments"
+nodescription	= "Remove descriptions"
 nodownload 	= "Remove downloading links"
+reverse_menu	= "Reverse menu order"
+rss		= "RSS feed"
+button_title	= "Title for buttons"
 numcomments	= "Number of comments in Admin Stats"
 numcomm 	= "Comments"
 sens 		= "Max number of images displayed when hovering an album"
+thumbs_size	= "Thumbnails size (px)"
 images 		= "Images"
 language	= "Language"
+user_theme	= "Theme"
 submit		= "Submit"
 generate 	= "Generate recursively thumbs and web images"
 folder		= "Folder"
 all			= "All"
 gener		= "Generate"
-video_comment	= "PhotoShow only displays videos in WebM. You can set the encoding to convert to other formats than webm"
-encode_video	= "Encode Video Activate"
+video		= "Video"
+video_comment	= "PhotoShow only displays videos in WebM. You can set the encoding to convert to other formats than webm."
+encode_video	= "Encode Video"
 ffmpeg_path	= "FFmpeg path"
 ffmpeg_option	= "Encoding option"
 
@@ -40,6 +51,7 @@ oldpass		= "Old Pass"
 submit 		= "Save"
 or 			= "or"
 cancel		= "Cancel"
+key		= "Key"
 
 [delete]
 delete		= "Delete"
@@ -55,9 +67,17 @@ groups  	= "Edit Groups"
 account 	= "Edit Accounts"
 back 		= "Back to Website"
 
+[statistics]
+heading		= "Statistics"
+summary		= "Summary"
+by_age		= "(by age)"
+items		= "Items"
+gen_items	= "Generated items"
+
 [jsaccounts]
 accounts 	= "Accounts"
 groups 		= "Groups"
+groupname_label	= "Group name:"
 groupname 	= "Name"
 addgroup 	= "Create Group"
 
@@ -65,6 +85,7 @@ addgroup 	= "Create Group"
 logintitle 	= "Login"
 login 		= "Login"
 pass 		= "Password"
+submit 		= "Submit"
 or 			= "or"
 register 	= "Register"
 back 		= "Back to Website"
@@ -84,16 +105,20 @@ back 		= "Back to Website"
 
 [menubar]
 logged 		= "logged as"
+not_logged	= "Not logged in!"
 login 		= "LOGIN"
 register 	= "REGISTER"
 logout 		= "LOGOUT"
 admin 		= "ADMIN"
+account		= "ACCOUNT"
 powered 	= "Powered by"
 
 [bin]
 delete 		= "Delete"
 
 [judge]
+infos		= "Infos"
+access		= "Access"
 public 		= "This item is public."
 gopriv 		= "Go Private"
 priv 		= "This item is private."
@@ -101,11 +126,13 @@ gopub 		= "Go Public"
 accounts 	= "Allowed accounts"
 groups 		= "Allowed groups"
 set 		= "Set Rights"
+exif		= "Exif"
 
 [adminpanel]
 rename  	= "Rename"
 new 		= "New Folder"
 create 		= "Create"
+upload_heading	= "Upload"
 upload 		= "Upload images here"
 
 [boardheader]
@@ -114,15 +141,34 @@ download 	= "DOWNLOAD"
 [board]
 albums 		= "Albums"
 images 		= "Images"
+videos 		= "Videos"
 
 [comments]
+comment		= "Comment"
 comments 	= "Comments"
 anonymous 	= "Anonymous"
 submit 		= "Post Comment"
 
+[description]
+description	= "Description"
+submit		= "Post Description"
+
 [token]
 token       = "Guest Token"
 tokens      = "Guest Tokens"
 deletetoken = "Delete"
 createtoken = "Create Guest Token"
 
+[buttons]
+prev		= "Previous"
+back		= "Back"
+img		= "View"
+get		= "Download"
+slideshow	= "Start slideshow"
+pshere		= "Photo Sphere"
+next		= "Next"
+pause		= "Pause slideshow"
+play		= "Play slideshow"
+stop		= "Stop slideshow"
+rss		= "RSS feed"
+menuright	= "Menu"
diff --git a/inc/loc/francais.ini b/inc/loc/francais.ini
index 9271da6..78995c8 100644
--- a/inc/loc/francais.ini
+++ b/inc/loc/francais.ini
@@ -1,27 +1,41 @@
 [settings]
-settings	= "Param&eagrave;tres"
+settings	= "Param&egrave;tres"
+global		= "G&eacute;n&eacute;ral"
 title 		= "Titre"
+site_address= "URL de la racine du site"
 buttons 	= "Boutons"
+s_networks	= "R&eacute;seaux sociaux"
 fb 			= "Facebook"
+facebook_appid 	= "Facebook Application ID"
+fbappid 	= "AppID"
 plusone 	= "Google +1"
 register 	= "Inscriptions"
+options		= "Options"
 noregister 	= "Bloquer les inscriptions"
 forcehttps 	= "Forcer HTTPS pour les inscriptions et identifications"
 comment		= "Comms"
 nocomment	= "Supprimer le panneau de commentaires"
 download	= "Archives"
+nocomments	= "Bloquer les commentaires"
+nodescription	= "Bloquer les descriptions"
 nodownload 	= "Bloquer le t&eacute;l&eacute;chargement de fichiers"
+reverse_menu	= "Inverser l'ordre du menu"
+rss		= "Flux RSS"
+button_title	= "Titre pour les boutons"
 numcomments	= "Nombre de commentaires sur la page de stats"
 numcomm 	= "Comms"
 sens 		= "Nombre maximal d'images affich&eacute;es au survol d'album"
+thumbs_size	= "Taille des miniatures (px)"
 images 		= "Images"
 language	= "Langue"
+user_theme	= "Th&egrave;me"
 submit		= "Valider"
-generate 	= "G&eacute;n&eacute;rer les vignettes et images 800x600 (r&eacute;cursif)"
+generate 	= "G&eacute;n&eacute;rer les vignettes et images (r&eacute;cursif)"
 folder		= "Dossier"
 all			= "Tout"
 gener		= "G&eacute;n&eacute;rer"
-video_comment	= "PhotoShow affiche uniquement les vid&eacute;os au format Webm. Tu peux activer l'encodage pour les autres formats"
+video		= "Vid&eacute;o"
+video_comment	= "PhotoShow affiche uniquement les vid&eacute;os au format WebM. Vous pouvez d&eacute;finir l'encodage pour les autres formats."
 encode_video	= "Encodage vid&eacute;o"
 ffmpeg_path	= "Chemin ffmpeg"
 ffmpeg_option	= "Options ffmpeg"
@@ -29,7 +43,7 @@ ffmpeg_option	= "Options ffmpeg"
 [account]
 createaccount	= "Cr&eacute;er un compte"
 account 	= "Compte"
-editing		= "Edition du compte : "
+editing		= "&Eacute;dition du compte : "
 name		= "Nom"
 email		= "Courriel"
 password	= "Mot de passe"
@@ -37,6 +51,7 @@ oldpass		= "Ancien mdp"
 submit 		= "Sauver"
 or 			= "ou"
 cancel		= "Annuler"
+key		= "Clef"
 
 [delete]
 delete		= "Supprimer"
@@ -44,16 +59,25 @@ path		= "Chemin"
 submit 		= "Supprimer"
 
 [adminmenu]
-about 		= "&Agrave; propos..."
-stats 		= "Afficher statistiques"
-settings 	= "Pr&eacute;f&eacute;rences"
+about 		= "&Agrave; propos"
+stats 		= "Statistiques"
+tokens 		= "Jetons d'authentification"
+settings 	= "Param&egrave;tres"
 account 	= "Comptes"
 groups 		= "Groupes"
 back 		= "Retour au site"
 
+[statistics]
+heading		= "Statistiques"
+summary		= "R&eacute;sum&eacute;"
+by_age		= "(par &acirc;ge)"
+items		= "Objets"
+gen_items	= "Objets g&eacute;n&eacute;r&eacute;s"
+
 [jsaccounts]
 accounts 	= "Comptes"
 groups 		= "Groupes"
+groupname_label	= "Nom du groupe :"
 groupname 	= "Nom"
 addgroup 	= "Cr&eacute;er le groupe"
 
@@ -81,16 +105,20 @@ back 		= "Retourner au site"
 
 [menubar]
 logged 		= "connect&eacute; en tant que"
+not_logged	= "Non connect&eacute;(e)"
 login 		= "CONNEXION"
 register 	= "INSCRIPTION"
 logout 		= "D&Eacute;CONNEXION"
 admin 		= "PR&Eacute;F&Eacute;RENCES"
+account		= "COMPTE"
 powered 	= "Ce site utilise"
 
 [bin]
 delete 		= "Supprimer"
 
 [judge]
+infos		= "Infos"
+access		= "Acc&egrave;s"
 public 		= "Cet &eacute;l&eacute;ment est public."
 gopriv 		= "Passer priv&eacute;"
 priv 		= "Cet &eacute;l&eacute;ment est priv&eacute;."
@@ -98,11 +126,13 @@ gopub 		= "Passer public"
 accounts 	= "Comptes autoris&eacute;s"
 groups 		= "Groupes autoris&eacute;s"
 set 		= "Valider"
+exif		= "Exif"
 
 [adminpanel]
 rename  	= "Renommer"
 new 		= "Nouveau dossier"
 create 		= "Cr&eacute;er"
+upload_heading	= "Ajout"
 upload 		= "Ajouter des images"
 
 [boardheader]
@@ -111,7 +141,34 @@ download 	= "T&Eacute;L&Eacute;CHARGER"
 [board]
 albums 		= "Albums"
 images 		= "Images"
+videos 		= "Vid&eacute;os"
 
 [comments]
+comment		= "Commentaire"
+comments 	= "Commentaires"
 anonymous 	= "Anonyme"
 submit 		= "Commenter"
+
+[description]
+description	= "Description"
+submit		= "Enregistrer"
+
+[token]
+token       = "Jeton invité"
+tokens      = "Jetons d'authentification"
+deletetoken = "Supprimer"
+createtoken = "Cr&eacute;er un jeton"
+
+[buttons]
+prev		= "Pr&eacute;c&eacute;dent"
+back		= "Retour"
+img		= "Afficher"
+get		= "T&eacute;l&eacute;charger"
+slideshow	= "D&eacute;marrer le diaporama"
+pshere		= "Photo Sphere"
+next		= "Suivant"
+pause		= "Mettre en pause le diaporama"
+play		= "Reprendre le diaporama"
+stop		= "Quitter le diaporama"
+rss		= "Flux RSS"
+menuright	= "Menu"
diff --git a/inc/spiffygif.gif b/inc/spiffygif.gif
new file mode 100644
index 0000000..1872d1f
Binary files /dev/null and b/inc/spiffygif.gif differ
diff --git a/index.php b/index.php
index aea7e84..d1c4b74 100644
--- a/index.php
+++ b/index.php
@@ -63,6 +63,13 @@ function protect_user_send_var($var){
 		return addslashes($var);
 }
 
+/// workaround for splitting basename whith beginning utf8 multibyte char
+/// See https://bugs.php.net/bug.php?id=37268
+function mb_basename($filepath, $suffix = NULL) {
+	$splited = preg_split ( '/\//', rtrim ( $filepath, '/ ' ) );
+	return substr ( basename ( 'X' . $splited [count ( $splited ) - 1], $suffix ), 1 );
+}
+
 
 if (!get_magic_quotes_gpc()){
 	$_POST = protect_user_send_var($_POST);
diff --git a/src/classes/Account.php b/src/classes/Account.php
index ba76cf0..b424ef6 100644
--- a/src/classes/Account.php
+++ b/src/classes/Account.php
@@ -444,7 +444,7 @@ public function toHTML(){
 	 	$this->header();
 
  		echo "<div class='header'>";
- 		echo "<h1>Account</h1>";
+ 		echo "<h1>".Settings::_("jsaccounts","accounts")."</h1>";
  		echo "</div>";
 
 		if(CurrentUser::$admin){
@@ -509,9 +509,9 @@ public function toHTML(){
 		}
 		echo	"</select>\n";
 
-		/// Login
+		/// Key
 		echo "<div class='pure-control-group'>
-					<label>".Settings::_("account","Key")."</label>
+					<label>".Settings::_("account","key")."</label>
 					<input type='text' name='key' readonly='readonly' value=\"".htmlentities($this->get_key(), ENT_QUOTES ,'UTF-8')."\">
 				</div>";
 
diff --git a/src/classes/Admin.php b/src/classes/Admin.php
index ddee9bb..7b8e812 100644
--- a/src/classes/Admin.php
+++ b/src/classes/Admin.php
@@ -216,31 +216,32 @@ public static function move(){
  		}
 
  		$from 	= File::r2a(stripslashes($_POST['pathFrom']));
- 		$to  	= File::r2a(stripslashes($_POST['pathTo']));
+ 		$to 	= dirname($from)."/".stripslashes($_POST['pathTo']);
  		$type 	= $_POST['move'];
 
  		if($from == $to){
  			return;
  		}
 
- 		if($type == "rename"){
- 			$thumbsDir = Settings::$thumbs_dir."/".stripslashes($_POST['pathFrom']);
- 			@rename($from,dirname($from)."/".stripslashes($_POST['pathTo']));
- 			@rename($thumbsDir,dirname($thumbsDir)."/".stripslashes($_POST['pathTo']));
- 			return;
- 		}
+		if(file_exists($to)){
+			/// We don't want to overwrite existing data
+			return;
+		}
 
- 		if(is_file($from) || $type=="directory"){
- 			@rename($from,$to."/".basename($from));
+ 		if($type == "rename"){
+			/// Metadatas need to be done first: once moved/deleted,
+			/// we won't be able to compute from the original file
+			Admin::manage_metadatas(stripslashes($_POST['pathFrom']), stripslashes($_POST['pathTo']));
+ 			@rename($from,$to);
  			return;
  		}
 
-
-
  		/// We are moving multiple files
  		$files = scandir($from);
  		foreach($files as $file){
  			if($file != "." && $file!=".."){
+				Admin::manage_metadatas(stripslashes($_POST['pathFrom'])."/".$file,
+							stripslashes($_POST['pathTo'])."/".$file);
 	 			@rename($from."/".$file,$to."/".$file);
 	 		}
  		}
@@ -262,12 +263,16 @@ public function delete(){
  		}
 
  		if(!is_array($_POST['del'])){
-	 		$del 	=	File::r2a(stripslashes($_POST['del']));
-	 		return 	Admin::rec_del($del);
+			$rela_del = stripslashes($_POST['del']);
+			$del 	=	File::r2a($rela_del);
+			Admin::manage_metadatas($rela_del);
+			Admin::rec_del($del);
  		}else{
  			foreach($_POST['del'] as $todel){
-		 		$del 	=	File::r2a(stripslashes($todel));
-		 		Admin::rec_del($del);
+				$rela_del = stripslashes($todel);
+				$del 	=	File::r2a($rela_del);
+				Admin::manage_metadatas($rela_del);
+				Admin::rec_del($del);
  			}
  		}
 	}
@@ -288,7 +293,7 @@ public function rec_del($dir){
 		}
 
 		$dirs 	=	Menu::list_dirs($dir);
-		$files 	= 	Menu::list_files($dir,false,true);
+		$files 	= 	Menu::list_files($dir,false,true,false,true);
 
 		foreach($dirs as $d){
 			Admin::rec_del($d);
@@ -301,6 +306,71 @@ public function rec_del($dir){
 		return rmdir($dir);
 	}
 
+	/**
+	 * Manage all metadatas (tokens, _*.xml, thumbnails)
+	 * associated to a file or folder
+	 *
+	 * @param string $file
+	 * @param string $to optional parameter for a rename
+	 */
+	public function manage_metadatas($file, $to = null){
+		$originalFile = File::r2a($file);
+		$thumbFile = Settings::$thumbs_dir.$file;
+		$thumbFile_dirname = dirname($thumbFile);
+		$isVideo = File::Type($originalFile) == "Video";
+
+		/// Tokens
+		/// It doesn't make any sense to rename a token: its link might
+		/// have been already shared, which is now broken because of the
+		/// file deletion/renaming, so delete them in all case
+		GuestToken::delete_file_tokens($file);
+
+		/// XML
+		if(is_file($originalFile)){
+			/// XML of folders are inside them, so they will be moved/deleted with the thumbnails
+			$xml_metadatas = array("comments","rights","description");
+			foreach($xml_metadatas as $xml_metadata){
+				$xml_metadata = "_".$xml_metadata.".xml";
+				$xml_file = $thumbFile_dirname."/.".mb_basename($file).$xml_metadata;
+				if (file_exists($xml_file)){
+					if (isset($to))
+						rename($xml_file, $thumbFile_dirname."/.".mb_basename($to).$xml_metadata);
+					else
+						unlink($xml_file);
+				}
+			}
+		}
+
+		/// Thumbnails
+		$originalFile_obj = new File($originalFile);
+		if ($isVideo){
+			/// A thumbnail of a picture has the same filename of the original file, but it's a jpg for a video
+			$thumbFile = $thumbFile_dirname."/".$originalFile_obj->name.".jpg";
+			$thumbFileTo = $thumbFile_dirname."/".mb_basename($to, $originalFile_obj->extension)."jpg";
+			$webFile = $thumbFile_dirname."/".$originalFile_obj->name.".webm";
+			$webFileTo = $thumbFile_dirname."/".mb_basename($to, $originalFile_obj->extension)."webm";
+		}
+		else{
+			$thumbFileTo = $thumbFile_dirname."/".$to;
+			$webFile = $thumbFile_dirname."/".$originalFile_obj->name."_small.".$originalFile_obj->extension;
+			$webFileTo = $thumbFile_dirname."/".mb_basename($to, '.'.$originalFile_obj->extension)."_small.".$originalFile_obj->extension;
+		}
+
+		if (!file_exists($thumbFile))
+			return;
+		if (isset($to)){
+			rename($thumbFile, $thumbFileTo);
+			// The webfile might not have been created yet, or $file is < 1200px, or $file is a folder:
+			if (file_exists($webFile))
+				rename($webFile, $webFileTo);
+		}
+		else{
+			Admin::rec_del($thumbFile);
+			if (file_exists($webFile))
+				// Only files can have a webFile, so we don't need rec_del()
+				unlink($webFile);
+		}
+	}
 
 	 /**
 	  * Display admin page
diff --git a/src/classes/AdminAbout.php b/src/classes/AdminAbout.php
index 0cff3a0..766d1e8 100644
--- a/src/classes/AdminAbout.php
+++ b/src/classes/AdminAbout.php
@@ -61,7 +61,7 @@ public function __construct(){
  	public function toHTML(){
 
  		echo "<div class='header'>";
- 		echo "<h1>About</h1>";
+ 		echo "<h1>".Settings::_("adminmenu","about")."</h1>";
  		echo "</div>";
 
  		echo "<h2>PhotoShow</h2>";
diff --git a/src/classes/AdminPanel.php b/src/classes/AdminPanel.php
index e8fd141..6cebe2f 100644
--- a/src/classes/AdminPanel.php
+++ b/src/classes/AdminPanel.php
@@ -42,8 +42,6 @@
 class AdminPanel
 {
 
-	private $infos;
-
 	private $j;
 
 	private $isfile = false;
@@ -56,54 +54,6 @@ public function __construct(){
 		}
 
 		$this->j = new Judge($file);
-		if(is_array($file)){
-			$this->infos = "";
-
-		}else{
-			$this->infos 		= $this->infodirtoHTML($file);
-		}
-	}
-
-
-	public function infodirtoHTML($dir){
-		$w 	= File::a2r($dir);
-		$ret = "";
-
-//		$ret .=	"<input type='submit' id='multiselectbutton' value='".Settings::_("adminpanel","multiselect")."'>";
-
-
-		/// Folder name
-		if(strlen($w)>1  && $this->isfile){
-		$ret .=	"<form class='niceform pure-form' action='?a=Mov' method='post'>
-					<input type='hidden' name='move' value='rename'>
-					<input type='hidden' name='pathFrom' value=\"".htmlentities($w, ENT_QUOTES ,'UTF-8')."\">
-					<input type='text' name='pathTo' style='max-width:100%; white-space: normal;' value=\"".htmlentities(basename($w), ENT_QUOTES ,'UTF-8')."\">
-					<input type='submit' class='pure-button pure-button-primary' value='".Settings::_("adminpanel","rename")."'>
-				</form>";
-		}else{
-			$ret .=	"<form class='niceform pure-form' action='?a=Upl' method='post'>
-						<input type='hidden' name='path' value=\"".htmlentities($w, ENT_QUOTES ,'UTF-8')."\">
-						<input id='foldername' name='newdir' style='max-width:100%;' type='text' value='".Settings::_("adminpanel","new")."'>
-						<input type='submit' class='pure-button pure-button-primary' value='".Settings::_("adminpanel","create")."'>
-					</form>";
-
-			/// Upload Images form
-			
-
-			/*$ret .= "<div id='files'></div>";
-			$w=File::a2r(CurrentUser::$path);
-			$ret .= "<form class='dropzone' id=\"".htmlentities($w, ENT_QUOTES ,'UTF-8')."\" 
-				action='?a=Upl' method='POST' enctype='multipart/form-data'>
-				<input type='hidden' name='path' value=\"".htmlentities($w, ENT_QUOTES ,'UTF-8')."\">
-				<input type='hidden' name='inherit' value='1' />
-				<input type='file' name='images[]' multiple >
-				<button>Upload</button>
-				<div>".Settings::_("adminpanel","upload")."</div>
-				</form>";
-				*/
-		}
-		return $ret;
-
 	}
 
 	public function toHTML(){
diff --git a/src/classes/AdminStats.php b/src/classes/AdminStats.php
index 44484f4..2b4f98f 100644
--- a/src/classes/AdminStats.php
+++ b/src/classes/AdminStats.php
@@ -87,26 +87,43 @@ public function Calculate() {
 	
 	}
 
+	private function _getRealName($name) {
+		switch ($name) {
+			case "Users":
+				return Settings::_("jsaccounts","accounts");
+			case "Groups":
+				return Settings::_("jsaccounts","groups");
+			case "Items":
+				return Settings::_("statistics","items");
+			case "Generated items":
+				return Settings::_("statistics","gen_items");
+			case "Albums":
+				return Settings::_("board","albums");
+			default:
+				return $name;
+		}
+	}
+
  	public function toHTML(){
 		self::Calculate() ;
 
  		echo "<div class='header'>";
- 		echo "<h1>Statistics</h1>";
+ 		echo "<h1>".Settings::_("statistics","heading")."</h1>";
  		echo "</div>";
 
- 		echo "<h2>Stats</h2>";
+ 		echo "<h2>".Settings::_("statistics","summary")."</h2>";
  		echo "<ul>";
  		echo "<table class='pure-table pure-table-striped'>";
  		echo "<tbody>";
  		foreach($this->stats as $name=>$val){
- 			echo "<tr><td>".htmlentities($name, ENT_QUOTES ,'UTF-8')."</td><td>".htmlentities($val, ENT_QUOTES ,'UTF-8')."</td></tr>"; 			
+ 			echo "<tr><td>".AdminStats::_getRealName($name)."</td><td>".htmlentities($val, ENT_QUOTES ,'UTF-8')."</td></tr>";
  		}
  		echo "</tbody>";
  		echo "</table>";
  		echo "</ul>";
 
 
- 		echo "<h2>Accounts (by age)</h2>";
+ 		echo "<h2>".Settings::_("jsaccounts","accounts")." ".Settings::_("statistics","by_age")."</h2>";
  		echo "<ul>";
  		echo "<table class='pure-table pure-table-striped'>";
  		echo "<tbody>";
@@ -118,7 +135,7 @@ public function toHTML(){
  		echo "</ul>";
 
 
- 		echo "<h2>Comments (by age)</h2>";
+ 		echo "<h2>".Settings::_("comments","comments")." ".Settings::_("statistics","by_age")."</h2>";
  		echo "<ul>";
  		echo "<table class='pure-table pure-table-striped'>";
  		echo "<tbody>";
diff --git a/src/classes/AdminUpload.php b/src/classes/AdminUpload.php
index d28e113..c09e179 100644
--- a/src/classes/AdminUpload.php
+++ b/src/classes/AdminUpload.php
@@ -43,34 +43,6 @@
  */
  class AdminUpload
  {
- 	/// Directories where we can upload
- 	public $dirs = array();
-
- 	/// What have we done ?
- 	public $done;
-
- 	/// Currently selected dir
- 	private $selected_dir;
-
- 	/**
- 	 * Create upload page
- 	 * 
- 	 * @author Thibaud Rohmer
- 	 */
- 	public function __construct(){
-
- 		/// Get all subdirs
- 		$list_dirs = Menu::list_dirs(Settings::$photos_dir,true);
-
- 		foreach ($list_dirs as $dir){
- 			$this->dirs[] = File::a2r($dir);
- 		}
-
- 		if(isset(CurrentUser::$path)){
- 			$this->selected_dir = File::a2r(CurrentUser::$path);
- 		}
-
- 	}
 
  	/**
  	 * Upload files on the server
@@ -129,7 +101,7 @@ public function upload(){
 		        $name = $_FILES["images"]["name"][$key];
 				
 				$info = pathinfo($name);
-				$base_name =  basename($name,'.'.$info['extension']);
+				$base_name =  mb_basename($name,'.'.$info['extension']);
 		
 				// Check filetype
 				if(!in_array(strtolower($info['extension']),$allowedExtensions)){
@@ -161,48 +133,5 @@ public function upload(){
 		}
 	}
 
- 	/**
- 	 * Display upload page on website
- 	 * 
- 	 * @author Thibaud Rohmer
- 	 */
- 	public function toHTML(){
- 		echo 	"<h1>Upload</h1>";
-
- 		echo 	"<form action='?t=Adm&a=Upl' method='post' enctype='multipart/form-data'>";
- 		echo 	"<fieldset><span>Images</span><div><input  name='images[]' type='file' multiple /></div></fieldset>";
- 		echo 	"<fieldset><span>Location</span><div><select name='path'>";
- 		echo 	"<option value='.'>.</option>";
-
- 		foreach($this->dirs as $dir){
- 				if($dir == $this->selected_dir){
- 					$selected = "selected";
- 				}else{
- 					$selected = "";
- 				}
- 				echo "<option value='".htmlentities($dir, ENT_QUOTES ,'UTF-8')."' $selected>".htmlentities($dir, ENT_QUOTES ,'UTF-8')."</option>\n";
- 		}
-
- 		echo 	"</select></div></fieldset>";
- 		echo 	"<fieldset><span>New Dir</span><div><input name='newdir' type='text' /></div></fieldset>";
- 	 	echo 	"<fieldset><span>Rights</span><div><label><input type='checkbox' name='inherit' checked /> Inherit</label></div></fieldset>";
- 		echo 	"<fieldset><span>Public</span><div><label><input type='checkbox' name='public' checked /> Public</label></div></fieldset>";
- 		echo 	"<fieldset><span>Groups</span><div>";
- 		foreach(Group::findAll() as $group){
- 			echo "<label><input type='checkbox' name='groups[]' value='".htmlentities($group['name'], ENT_QUOTES ,'UTF-8')."' checked /> ".htmlentities($group['name'], ENT_QUOTES ,'UTF-8')." </label>";
- 		}
- 		echo 	"</div></fieldset>";
- 	
- 		echo 	"<fieldset><span>Users</span><div>";
- 		foreach(Account::findAll() as $account){
- 			echo "<label><input type='checkbox' name='users[]' value='".htmlentities($account['login'], ENT_QUOTES ,'UTF-8')."' checked /> ".htmlentities($account['login'], ENT_QUOTES ,'UTF-8')." </label>";
- 		}
- 		echo 	"</div></fieldset>";
- 		echo 	"<fieldset><input type='submit' class='button blue' /></fieldset>";
-
- 		echo 	"</form>";
-
- 	}
-
  }
  ?>
\ No newline at end of file
diff --git a/src/classes/Board.php b/src/classes/Board.php
index e66b3ff..3e0116c 100644
--- a/src/classes/Board.php
+++ b/src/classes/Board.php
@@ -46,9 +46,6 @@
  */
 class Board implements HTMLObject
 {
-	/// Board title : name of the directory listed
-	private $title;
-    
     /// Header
     public $header_content;
 	
@@ -64,6 +61,9 @@ class Board implements HTMLObject
 	/// Board header, containing the title and some buttons
 	private $header;
 	
+	/// Description object, containing the description for the folder
+	private $description;
+	
 	/// Array of each line of the grid
 	private $boarditems=array();
 
@@ -90,8 +90,7 @@ public function __construct($path=NULL){
 			$this->path		=	dirname($path);
 		}
 		
-		$this->title	=	basename($this->path);
-		$this->header	=	new BoardHeader($this->title,$this->path);
+		$this->header	=	new BoardHeader();
 		$this->files	=	Menu::list_files($this->path);
 		$this->dirs		=	Menu::list_dirs($this->path);
 
@@ -137,6 +136,9 @@ public function __construct($path=NULL){
         }
 		
 		$this->foldergrid();
+
+		if(!Settings::$nodescription)
+			$this->description = new Description($this->path);
 	}
 	
 
@@ -204,6 +206,12 @@ public function toHTML(){
 		// Output header
 		$this->header->toHTML();
 
+		if(!Settings::$nodescription){
+			echo "<div class='description'>";
+			$this->description->toHTML();
+			echo "</div>";
+		}
+
 		if(sizeof($this->boardfolders)>0){
 			echo "<div class='section sectiondir'>";
 			echo "<h2>".Settings::_("board","albums")."</h2>";
diff --git a/src/classes/BoardDir.php b/src/classes/BoardDir.php
index 0f2d15c..4d01664 100644
--- a/src/classes/BoardDir.php
+++ b/src/classes/BoardDir.php
@@ -84,7 +84,7 @@ public function toHTML(){
 		echo "<div class=' pure-u-1-3 pure-u-sm-1-3 pure-u-lg-1-4 pure-u-xl-1-8'>";
 		echo "<div class='directory'>";
 		echo 	"<a href=\"?f=$this->url\">";
-		echo 	"<img src=\"$this->img\"/ >";
+		echo 	"<img src=\"$this->img\" alt=\"\" />";
 		echo "<div class='dirname'>";
 		(array)$name = explode('/', $this->path);
 		echo 	htmlentities(end($name), ENT_QUOTES ,'UTF-8');
diff --git a/src/classes/BoardHeader.php b/src/classes/BoardHeader.php
index 16b3179..fd6d17c 100644
--- a/src/classes/BoardHeader.php
+++ b/src/classes/BoardHeader.php
@@ -60,7 +60,7 @@ class BoardHeader{
 	 */
 	public function __construct(){
 		$this->path 	=	urlencode(File::a2r(CurrentUser::$path));
-		$this->title 	=	is_dir(CurrentUser::$path)?end(explode('/', CurrentUser::$path)):end(explode('/', dirname(CurrentUser::$path)));
+		$this->title 	=	is_dir(CurrentUser::$path)?mb_basename(CurrentUser::$path):mb_basename(dirname(CurrentUser::$path));
 		$this->w 		= 	File::a2r(CurrentUser::$path);
 	}
 	
diff --git a/src/classes/BoardItem.php b/src/classes/BoardItem.php
index f60fae4..1366806 100644
--- a/src/classes/BoardItem.php
+++ b/src/classes/BoardItem.php
@@ -81,7 +81,7 @@ public function toHTML(){
 
 		echo "<div class='item $lgcls pure-u-1-2 pure-u-sm-1-2 pure-u-md-1-3 pure-u-lg-1-4 pure-u-xl-1-8'>";
 		echo 	"<a href='?f=$this->file'>";
-		echo 	"<img src='?$getfile'>";
+		echo 	"<img src='?$getfile' alt=\"\" />";
 		echo 	"</a>\n";
 		echo "</div>\n";
 
diff --git a/src/classes/Comments.php b/src/classes/Comments.php
index 09b5cce..c541e1f 100644
--- a/src/classes/Comments.php
+++ b/src/classes/Comments.php
@@ -74,11 +74,13 @@ public function __construct($file=null){
 		
 		/// No item, no comment !
 		if(!isset($file) || is_array($file)) return;
+
+		/// No right to view
+		if(!Judge::view($file))
+			return;
 				
 		/// Set variables
 		$this->file	=	$file;
-		$settings	=	new Settings();
-		$basefile	= 	new File($file);
 		$basepath	=	File::a2r($file);
 
 		/// Urlencode basepath
@@ -86,7 +88,7 @@ public function __construct($file=null){
 
 		/// Build relative path to comments file
 		if(is_file($file)){
-			$comments	=	dirname($basepath)."/.".basename($file)."_comments.xml";
+			$comments	=	dirname($basepath)."/.".mb_basename($file)."_comments.xml";
 		}else{
 			$comments 	=	$basepath."/.comments.xml";
 		}
@@ -161,7 +163,7 @@ public function save(){
 			$c = $xml->addChild("comment");
 			$c->addChild("login"	, $comment->login);
 			$c->addChild("date"		, $comment->date);
-			$c->addChild("content"	, $comment->content);
+			$c->content = $comment->content;
 		}
 
 		if(!file_exists(dirname($this->commentsfile))){
@@ -219,6 +221,9 @@ private function toMainCommentsFile($comment){
 	 * @author Thibaud Rohmer
 	 */
 	public function toHTML(){	
+		if(!$this->file)
+			return;
+
 		echo '<h3>'.Settings::_("comments","comments").'</h3>';
 
 		echo "<div class='display_comments'>";	
@@ -233,7 +238,7 @@ public function toHTML(){
 		if(isset(CurrentUser::$account)){
 			echo "<form action='?t=Com&f=".$this->webfile."' class='pure-form pure-form-stacked' id='comments_form' method='post'><fieldset class='transparent'>\n";
 			echo "<input type='hidden' name='login' id='login' value='".htmlentities(CurrentUser::$account->login, ENT_QUOTES ,'UTF-8')."' readonly>";			
-			echo "<textarea name='content' id='content' placeholder='Comment'></textarea>\n";
+			echo "<textarea name='content' id='content' placeholder='".Settings::_("comments","comment")."'></textarea>\n";
 			echo "<input type='submit' class='pure-button pure-button-primary' value='".Settings::_("comments","submit")."'></fieldset>\n";
 			echo "</form>\n";	
 		}
diff --git a/src/classes/CurrentUser.php b/src/classes/CurrentUser.php
index ed29cdb..77530d3 100755
--- a/src/classes/CurrentUser.php
+++ b/src/classes/CurrentUser.php
@@ -240,6 +240,9 @@ static public function init(){
 				case "Com"	:	Comments::add(CurrentUser::$path,$_POST['content'],$_POST['login']);
 								break;
 
+				case "Des"	:	Description::add(CurrentUser::$path,$_POST['content'],$_POST['login']);
+								break;
+
 				case "Rig"	:	Judge::edit(CurrentUser::$path,$_POST['users'],isset($_POST['groups'])?$_POST['groups']:null,true);
 								CurrentUser::$action = "Judge";
 								break;
@@ -269,6 +272,9 @@ static public function init(){
 			}
 		}else{
 			CurrentUser::$action = "Page";
+
+			// User is not logged in => display login page only if gallery is private
+			if( !isset(CurrentUser::$account) && !isset(CurrentUser::$token) && !Judge::view( Settings::$photos_dir ) )	CurrentUser::$action = "Login";
 		}
 
 		if(isset($_GET['a']) && CurrentUser::$action != "Adm"){
diff --git a/src/classes/Description.php b/src/classes/Description.php
new file mode 100644
index 0000000..365dfe0
--- /dev/null
+++ b/src/classes/Description.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * This file implements the class Description.
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * This file is part of PhotoShow.
+ *
+ * PhotoShow 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PhotoShow 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 PhotoShow.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Website
+ * @package   Photoshow
+ * @author    Thibaud Rohmer <thibaud.rohmer@gmail.com>
+ * @copyright 2011 Thibaud Rohmer
+ * @license   http://www.gnu.org/licenses/
+ * @link      http://github.com/thibaud-rohmer/PhotoShow
+ */
+
+/**
+ * Description
+ *
+ * Implements the creating, reading, editing, and
+ * displaying of the description, from and to an xml
+ * file.
+ * The file is stored in
+ * [Thumbs]/[imagepath]/.[image]_description.xml
+ * Description Structure:
+ * 	- Login
+ * 	- Date
+ * 	- Content
+ *
+ * @category  Website
+ * @package   Photoshow
+ * @author    Thibaud Rohmer <thibaud.rohmer@gmail.com>
+ * @copyright Thibaud Rohmer
+ * @license   http://www.gnu.org/licenses/
+ * @link      http://github.com/thibaud-rohmer/PhotoShow
+ */
+class Description implements HTMLObject
+{
+	/// Array of the description infos
+	private $description=array();
+
+	/// Path to item
+	private $file;
+
+	/// Path to description file
+	private $descriptionfile;
+
+	/// Urlencoded version of relative path to item
+	private $webfile;
+
+	/**
+	 * Read description for item $file
+	 *
+	 * @param string $file
+	 */
+	public function __construct($file=null){
+
+		/// No item, no description !
+		if(!isset($file) || is_array($file)) return;
+
+		/// No right to view
+		if(!Judge::view($file))
+			return;
+
+		/// Set variables
+		$this->file	=	$file;
+		$basepath	=	File::a2r($file);
+
+		/// Urlencode basepath
+		$this->webfile = urlencode(File::a2r($file));
+
+		/// Build relative path to description file
+		if(is_file($file)){
+			$description	=	dirname($basepath)."/.".mb_basename($file)."_description.xml";
+		}else{
+			$description	=	$basepath."/.description.xml";
+		}
+
+		/// Set absolute path to description file
+		$this->descriptionfile =	File::r2a($description,Settings::$thumbs_dir);
+
+		/// Check that description file exists
+		if(file_exists($this->descriptionfile)){
+			$this->parse_description_file();
+		}
+	}
+
+	/**
+	 * Add a description for item $file
+	 *
+	 * @param string $file
+	 * @param string $login
+	 * @param string $description
+	 */
+	public static function add($file,$content,$login=""){
+
+		/// Just to be really sure...
+		if( !(CurrentUser::$admin || CurrentUser::$uploader) ){
+			return;
+		}
+
+		/// Get context
+		$description = new Description($file);
+
+		if(empty($content)){
+			/// Description is empty, might as well delete the file
+			if(file_exists($description->descriptionfile))
+				unlink($description->descriptionfile);
+			return;
+		}
+
+		/// Store the description
+		$description->description['login'] = $login;
+		$description->description['content'] = $content;
+		$description->description['date'] = date('j-m-y, h-i-s');
+
+		/// And save it
+		$description->save();
+	}
+
+
+	public function save(){
+
+		$xml = new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><description></description>');
+
+		$xml->addChild("login"	, $this->description['login']);
+		$xml->addChild("date"	, $this->description['date']);
+		$xml->content = $this->description['content'];
+
+		if(!file_exists(dirname($this->descriptionfile))){
+			@mkdir(dirname($this->descriptionfile),0750,true);
+		}
+		/// Write xml
+		$xml->asXML($this->descriptionfile);
+	}
+
+
+	/**
+	 * Read content of description file, and
+	 * store it in variables
+	 *
+	 * @return void
+	 */
+	private function parse_description_file(){
+		$xml		=	simplexml_load_file($this->descriptionfile);
+		$this->description['login'] = $xml->login;
+		$this->description['date'] = $xml->date;
+		$this->description['content'] = $xml->content;
+	}
+
+
+	/**
+	 * Display description on website
+	 *
+	 * @return void
+	 */
+	public function toHTML($forInfosMenu=false){
+		if(!$this->file)
+			return;
+
+		$desc = stripslashes(htmlentities($this->description['content'], ENT_QUOTES ,'UTF-8'));
+
+		if (!$forInfosMenu)
+			echo nl2br($desc);
+		else if(CurrentUser::$admin || CurrentUser::$uploader){
+			// It's for the Infos menu, but only the admin or an uploader can write a description
+			echo '<h3>'.Settings::_("description","description").'</h3>';
+
+			echo "<form action='?t=Des&f=".$this->webfile."' class='pure-form pure-form-stacked' id='description_form' method='post'><fieldset class='transparent'>\n";
+			echo "<input type='hidden' name='login' id='login' value='".htmlentities(CurrentUser::$account->login, ENT_QUOTES ,'UTF-8')."' readonly>";
+			echo "<textarea name='content' id='content' placeholder='".Settings::_("description","description")."'>".$desc."</textarea>\n";
+			echo "<input type='submit' class='pure-button pure-button-primary' value='".Settings::_("description","submit")."'></fieldset>\n";
+			echo "</form>\n";
+		}
+
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/src/classes/Exif.php b/src/classes/Exif.php
index 32a822d..ff35dc6 100644
--- a/src/classes/Exif.php
+++ b/src/classes/Exif.php
@@ -51,9 +51,6 @@ class Exif implements HTMLObject
 	/// Exif values, nice and clean
 	private $exif=array();
 	
-	/// Name of the file
-	private $filename;
-
 	/**
 	 * Create Exif class
 	 *
@@ -94,7 +91,6 @@ public function __construct($file=null){
 				}
 			}
 		}	
-		$this->filename = basename($file);
 	}
 	
 	/**
@@ -122,7 +118,7 @@ private function init_wanted(){
 	 */
 	public function toHTML(){
 		if($this->exif){
-			echo '<h3>Exif</h3>';
+			echo '<h3>'.Settings::_("judge","exif").'</h3>';
 			echo "<table>";		
 			foreach($this->exif as $name=>$value){
 				echo "<tr><td class='td_data'>".htmlentities($name, ENT_QUOTES ,'UTF-8')."</td>";
diff --git a/src/classes/File.php b/src/classes/File.php
index c5ceaf4..8ee42bd 100644
--- a/src/classes/File.php
+++ b/src/classes/File.php
@@ -107,9 +107,9 @@ public static function Extension($file){
 	public static function Name($file){
 		$info	=	pathinfo($file);
 		if(isset($info['extension'])){
-			return	basename($file,'.'.$info['extension']);
+			return	mb_basename($file,'.'.$info['extension']);
 		}else{
-			return basename($file);
+			return mb_basename($file);
 		}
 	}
 	
@@ -127,7 +127,7 @@ public static function Type($file){
 		}
 
 		$ext	=	self::Extension($file);
-		if(!isset($ext)){
+		if(empty($ext)){
 			return "folder";
 		}
 
diff --git a/src/classes/Group.php b/src/classes/Group.php
index 8732b6f..176029f 100644
--- a/src/classes/Group.php
+++ b/src/classes/Group.php
@@ -280,12 +280,12 @@ public function toHTML(){
 		$groupaccounts = array();
 
 
-		echo "<div class='header'><h1>Groups</h1></div>";
+		echo "<div class='header'><h1>".Settings::_("jsaccounts","groups")."</h1></div>";
 
 		echo "<form class='pure-form pure-form-aligned' method='post' action='?t=Adm&a=GC'>
 			<h2>".Settings::_("jsaccounts","addgroup")."</h2>
 			<div class='pure-control-group'>
-			<label>Group name : </label><input type='text' name='group' placeholder='".Settings::_("jsaccounts","groupname")."' />
+			<label>".Settings::_("jsaccounts","groupname_label")."</label><input type='text' name='group' placeholder='".Settings::_("jsaccounts","groupname")."' />
 			</div>
 			<div class='pure-controls'>
 			<input type='submit' class='pure-button button-success' value='".Settings::_("jsaccounts","addgroup")."' />
diff --git a/src/classes/GuestToken.php b/src/classes/GuestToken.php
index 688a4ca..3ee3532 100644
--- a/src/classes/GuestToken.php
+++ b/src/classes/GuestToken.php
@@ -156,6 +156,17 @@ public static function delete($key){
         }
     }
 
+    /**
+     * Delete all tokens linked to a file
+     *
+     * @param string $file (relative path)
+     */
+    public static function delete_file_tokens($file){
+        foreach( self::find_for_path($file, true) as $token ) {
+            self::delete($token['key']);
+        }
+    }
+
     /**
      * Check if a token already exists
      *
@@ -358,7 +369,7 @@ public function toHTML(){
         foreach(self::findAll() as $t){
             echo "<tr>";
             echo "<td>";
-            echo "<form action='?t=Adm&a=DTk' method='post'>\n";
+            echo "<form action='?t=Adm&a=DTk' method='post' onsubmit='return executeOnSubmit(`tokenDelete`);'>\n";
             echo "<input type='hidden' name='tokenkey' value='".$t['key']."' />";
             echo "<input type='submit' class='pure-button button-error' value='".Settings::_("token","deletetoken")."' />";
             echo "</form>";
diff --git a/src/classes/Image.php b/src/classes/Image.php
index c726aab..d656cfa 100644
--- a/src/classes/Image.php
+++ b/src/classes/Image.php
@@ -116,7 +116,7 @@ public function toHTML(){
 
 		echo "<input type='hidden' id='imageurl' value='?t=Big&f=$this->fileweb'>";
 		echo 	"<a href='?f=$this->dir'>"; 
-		echo 	"<img src='inc/img.png' height='100%' width='100%' style='opacity:0;'>";
+		echo 	"<img src='inc/img.png' style='opacity:0;' alt=\"\">";
 		echo 	"</a>";
 		echo	"</div>";
 	}
diff --git a/src/classes/ImageBar.php b/src/classes/ImageBar.php
index 7cf885f..0baaf99 100644
--- a/src/classes/ImageBar.php
+++ b/src/classes/ImageBar.php
@@ -63,7 +63,7 @@ public function __construct($fs=false){
 
 		$file = urlencode(File::a2r(CurrentUser::$path));
 
-		$this->photosphere = (basename(dirname(CurrentUser::$path)) == "PhotoSpheres");
+		$this->photosphere = (mb_basename(dirname(CurrentUser::$path)) == "PhotoSpheres");
 
 		$this->buttons['prev'] = 	"?p=p&f=".$file;
 		$this->awesome['prev'] = 	"<i class='fa fa-chevron-left fa-lg'></i>";
@@ -110,10 +110,10 @@ public function __construct($fs=false){
 	 */
 	 public function toHTML(){
 	 	foreach($this->buttons as $name=>$url){
-	 		echo "<span id='$name'><a href='$url'>".$this->awesome[$name]."</a></span>";
+			echo "<span id='$name'><a href='$url' ".(Settings::$button_title ? "title='".Settings::_("buttons",$name)."'" : "").">".$this->awesome[$name]."</a></span>";
 	 	}
 	 }
 
 }
 
-?>
\ No newline at end of file
+?>
\ No newline at end of file
diff --git a/src/classes/ImagePanel.php b/src/classes/ImagePanel.php
index 32dec59..9da0a47 100644
--- a/src/classes/ImagePanel.php
+++ b/src/classes/ImagePanel.php
@@ -32,9 +32,7 @@
 /**
  * ImagePanel
  *
- * The ImagePanel contains one image, and the infos
- * about that image (such as EXIF, Comments).
- * If the user is logged, it contains even more stuff.
+ * The ImagePanel contains one image and the navigation buttons.
  *
  * @category  Website
  * @package   Photoshow
@@ -56,12 +54,9 @@ class ImagePanel implements HTMLObject
 	/// Video object
 	private $video;
 	
-	/// Exif object
-	private $exif;
-	
-	/// Comments object
-	private $comments;
-	
+	/// Description object
+	private $description;
+
 	/// Judge object
 	private $judge;
 
@@ -88,17 +83,14 @@ public function __construct($file=NULL){
             $this->video	=	new Video($file);		
         }		
 		
+		if(!Settings::$nodescription){
+			/// Create Description object
+			$this->description = new Description($file);
+		}
+
 		/// Create Image object
 		$this->imagebar	=	new ImageBar($file);
 
-		/// Create EXIF object
-		$this->exif		=	new Exif($file);
-		
-		if(!Settings::$nocomments){
-			/// Create Comments object
-			$this->comments	=	new Comments($file);
-		}
-
         $pageURL = Settings::$site_address."/?f=".urlencode(File::a2r($file));
         
         // generate the header - opengraph metatags for facebook
@@ -125,11 +117,9 @@ public function toHTML(){
         if (!isset($this->image) && !isset($this->video)){
             return;
         }
-        /*
-		echo "<div id='exif' class='box'>\n";
-		$this->exif->toHTML();
-         */
 		
+		echo "<div id='image_panel_table'>\n";
+
 		if(isset($this->image)){
 			echo "<div id='bigimage'>\n";
 
@@ -143,9 +133,17 @@ public function toHTML(){
 			echo "</div>\n";
 		}		
 
+		if(!Settings::$nodescription){
+			echo "<div class='description'>";
+			$this->description->toHTML();
+			echo "</div>";
+		}
+
 		echo "<div id='image_bar'>\n";
 		$this->imagebar->toHTML();
 		echo "</div>\n";
+
+		echo "</div>\n";
 	}
 	
 }
diff --git a/src/classes/Infos.php b/src/classes/Infos.php
index 1c0df99..627cf3c 100644
--- a/src/classes/Infos.php
+++ b/src/classes/Infos.php
@@ -43,6 +43,8 @@
  * @license   http://www.gnu.org/licenses/
  * @link      http://github.com/thibaud-rohmer/PhotoShow
  */
+ 
+ 
 
 class Infos implements HTMLObject
 {
@@ -54,6 +56,8 @@ class Infos implements HTMLObject
 
 	private $comments;
 
+	private $description;
+
 	private $path;
 
 	private $w;
@@ -74,30 +78,33 @@ public function __construct(){
 		
 		$this->exif = new Exif(CurrentUser::$path);
 
-
 		if(!Settings::$nocomments){
 			$this->comments	=	new Comments(CurrentUser::$path);
 		}
 
+		if(!Settings::$nodescription){
+			$this->description	=	new Description(CurrentUser::$path);
+		}
+
 		$this->path 	=	urlencode(File::a2r(CurrentUser::$path));
-		$this->title 	=	basename(CurrentUser::$path);
+		$this->title 	=	mb_basename(CurrentUser::$path);
 		$this->w 		= 	File::a2r(CurrentUser::$path);
 
 		if(is_file(CurrentUser::$path)){
 			$this->thumb ="<img src=\"?t=Thb&f=".urlencode(File::a2r(CurrentUser::$path))."\" />";
 			$this->dl = "?t=BDl&f=$this->path";
 		}else{
-			$this->thumb ="<img src='inc/folder.png' />";
+			$this->thumb ="<img src='inc/folder.png' alt='Folder' />";
 			$this->dl = "?t=Zip&f=$this->path";
 		}
 
 		if(CurrentUser::$admin){
 
-		$this->deleteform = "<div id='deleteform'><form class='pure-form' action='?a=Del' method='post'>
+		$this->deleteform = "<div id='deleteform'><form class='pure-form' action='?a=Del' method='post' onsubmit='return executeOnSubmit(`delete`);'>
 				<input type='hidden' name='del' value=\"".htmlentities($this->w, ENT_QUOTES ,'UTF-8')."\">
-						<button class='button-round button-error' type='submit'><i class='fa fa-trash-o'></i></button>
+						<button class='button-round button-error' type='submit' ".(Settings::$button_title ? "title='".Settings::_("bin","delete")."'" : "")."><i class='fa fa-trash-o'></i></button>
 				</form>
-				</div>";
+				</div>";         	
 		}
 	}
 
@@ -111,13 +118,13 @@ public function toHTML(){
 		echo "<div class='infos_title'>".htmlentities($this->title, ENT_QUOTES ,'UTF-8')."</div>";
 		if(!Settings::$nodownload){
 			/// Zip button
-			echo 	"<a href='$this->dl' class='floating-action'><i class='fa fa-arrow-down fa-large'></i></a>\n";
+			echo 	"<a href='$this->dl' class='floating-action' ".(Settings::$button_title ? "title='".Settings::_("buttons","get")."'" : "")." onclick='return executeOnSubmit(`download`)'><i class='fa fa-arrow-down fa-large'></i></a>\n";
 		}
 		echo "</div>";
 
-		if(CurrentUser::$admin && is_dir(CurrentUser::$path)){
+		if((CurrentUser::$admin || CurrentUser::$uploader) && is_dir(CurrentUser::$path)){
 		/// Upload Images form
-			echo "<h3>Upload</h3>";
+			echo "<h3>".Settings::_("adminpanel","upload_heading")."</h3>";
 			echo "<div id='files'></div>";
 			echo "<form class='dropzone' id=\"".htmlentities($this->w, ENT_QUOTES ,'UTF-8')."\" 
 				action='?a=Upl' method='POST' enctype='multipart/form-data'>
@@ -141,12 +148,17 @@ public function toHTML(){
 		}
 		echo "</div>\n";
 
+		echo "<div id='description_form' class='box'>\n";
+		if(!Settings::$nodescription){
+			$this->description->toHTML(true);
+		}
+		echo "</div>\n";
+
 		echo "<div id='share'>\n";
 		echo 	"<span></span>";
 		
 		echo "<div>";
 
-
 		// Outputting Facebook Like Button
 		if(Settings::$like){				
 			$rootURL = Settings::$site_address;
@@ -154,13 +166,8 @@ public function toHTML(){
 			echo '<iframe src="//www.facebook.com/plugins/like.php?href='.$pageURL.'&amp;send=false&amp;layout=button_count&amp;width=100&amp;show_faces=true&amp;action=like&amp;colorscheme=light&amp;font&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:100px; height:21px;" allowTransparency="true"></iframe>';
 		}
 
-
 		echo "</div>";
 
-
-
-		echo 	"</span>\n";
-
 		echo "</div>";
 
 	}
diff --git a/src/classes/JS.php b/src/classes/JS.php
index 5f4ab0c..1f53939 100644
--- a/src/classes/JS.php
+++ b/src/classes/JS.php
@@ -120,6 +120,10 @@ public function __construct(){
 								$f->toHTML();
 								break;
 
+				case "Desc":	$f = new Description(CurrentUser::$path);
+								$f->toHTML();
+								break;
+
 				default:		break;
 			}
 		}
diff --git a/src/classes/Judge.php b/src/classes/Judge.php
index 1943ead..3c88aad 100644
--- a/src/classes/Judge.php
+++ b/src/classes/Judge.php
@@ -128,7 +128,7 @@ private function set_path($f){
 		$this->webpath 	= "&f=".urlencode($basepath);
 
 		if(is_file($f)){
-			$rightsfile	=	dirname($basepath)."/.".basename($f)."_rights.xml";
+			$rightsfile	=	dirname($basepath)."/.".mb_basename($f)."_rights.xml";
 		}else{
 			$rightsfile	=	$basepath."/.rights.xml";
 		}
@@ -181,19 +181,6 @@ private function set_rights(){
 		}
 	}
 
-	/**
-	 * Returns path to associated file
-	 */
-	public static function associated_file($rf){
-		$associated_dir = File::r2a(File::a2r(dirname($rf),Settings::$thumbs_dir),Settings::$photos_dir);
-		if(basename($rf) == ".rights.xml"){
-			return $associated_dir;
-		}else{
-			return $associated_dir."/".substr(basename($rf),1,-11);
-		}		
-	}
-
-
 	/**
 	 * Check recursively if a file is viewable in a folder, and returns path to that file.
 	 */
@@ -376,12 +363,12 @@ public function infodirtoHTML($dir){
 		$ret = "";
 
 		if(strlen($w)>1){
-		$ret .= 	"<form class='pure-form' action='?a=Mov' method='post'>
+		$ret .= 	"<form class='pure-form' action='?a=Mov' method='post' onsubmit='return executeOnSubmit(`rename`);'>
 					<input type='hidden' name='move' value='rename'>
 					<input type='hidden' name='pathFrom' value=\"".htmlentities($w, ENT_QUOTES ,'UTF-8')."\">
 					<div class='pure-g'>
 						<div class=' pure-u-1-2'>
-							<input type='text' class='toto' name='pathTo' value=\"".htmlentities(basename($w), ENT_QUOTES ,'UTF-8')."\">
+							<input type='text' class='toto' name='pathTo' value=\"".htmlentities(mb_basename($w), ENT_QUOTES ,'UTF-8')."\">
 						</div>
 						<div class='pure-u-1-2'>
 							<input class='pure-button pure-button-primary' type='submit' value='".Settings::_("adminpanel","rename")."'>
@@ -392,7 +379,7 @@ public function infodirtoHTML($dir){
 
 		/// Folder name
 		if(is_dir($dir)){
-		$ret .=	"<form class='niceform pure-form' action='?a=Upl' method='post'>
+		$ret .=	"<form class='niceform pure-form' action='?a=Upl' method='post'  onsubmit='return executeOnSubmit(`create`);'>
 						<input type='hidden' name='path' value=\"".htmlentities($w, ENT_QUOTES ,'UTF-8')."\">
 
 						<div class='pure-g'>
@@ -421,22 +408,22 @@ public function toHTML(){
 
 
 
-		echo "<h3>Infos</h3>";
+		echo "<h3>".Settings::_("judge","infos")."</h3>";
 
 		echo $this->infos;
 
-		echo "<h3>Access</h3>";
+		echo "<h3>".Settings::_("judge","access")."</h3>";
 		if($this->public){
 			echo "<div class='pure-g'><div class='pure-u-1-3'>";
-				echo "<a href='?t=Pri$this->webpath'class='button-round button-success'><i class='fa fa-unlock'></i></a></div>";
+				echo "<a href='?t=Pri$this->webpath'class='button-round button-success' ".(Settings::$button_title ? "title='".Settings::_("judge","gopriv")."'" : "")." onclick='return executeOnSubmit(`permissions`)'><i class='fa fa-unlock'></i></a></div>";
 			echo "<div class='pure-u-2-3'>".Settings::_("judge","public")."</div></div>";
 		}else{
 			echo "<div class='pure-g'><div class='pure-u-1-3'>";
-				echo "<a href='?t=Pub$this->webpath'class='button-round button-error'><i class='fa fa-lock'></i></a></div>";
+				echo "<a href='?t=Pub$this->webpath'class='button-round button-error' ".(Settings::$button_title ? "title='".Settings::_("judge","gopub")."'" : "")." onclick='return executeOnSubmit(`permissions`)'><i class='fa fa-lock'></i></a></div>";
 			echo "<div class='pure-u-2-3'>".Settings::_("judge","priv")."</div></div>";
 		}
 
-		echo "<form action='?t=Rig$this->webpath' method='post' class='pure-form pure-form-aligned'>";
+		echo "<form action='?t=Rig$this->webpath' method='post' class='pure-form pure-form-aligned' onsubmit='return executeOnSubmit(`permissions`);'>";
 		if(! $this->public){
 			echo "<h3>".Settings::_("judge","accounts")."</h3>";
 			echo "<ul>";
@@ -468,7 +455,7 @@ public function toHTML(){
 			echo "<input type='submit' class='pure-button pure-button-primary button-small' value='".Settings::_("judge","set")."'>\n";
         	echo "</ul>";
         	
-    	    echo "<h3>Guest Tokens</h3>";
+    	    echo "<h3>".Settings::_("token","tokens")."</h3>";
     	    if(!$this->multi){
 	        // Token creation
 	        $tokens = GuestToken::find_for_path($this->file);
@@ -477,11 +464,11 @@ public function toHTML(){
 	        		$i=0;
 	        	    foreach($tokens as $token){
 	        	    	$i++;
-	        	        echo "<a class='pure-button button-small button-warning' href='".GuestToken::get_url($token['key'])."' >Guest Token $i</a><br />\n";
+	        	        echo "<a class='pure-button button-small button-warning' href='".GuestToken::get_url($token['key'])."' >".Settings::_("token","token")." $i</a><br />\n";
 	        	    }
 	        	    echo "</ul>";
 	    	    }
-	    	    echo "<ul><a href='?t=CTk$this->webpath' class='pure-button button-secondary button-small'>".Settings::_("token","createtoken")."</a></ul>";
+	    	    echo "<ul><a href='?t=CTk$this->webpath' class='pure-button button-secondary button-small' onclick='return executeOnSubmit(`token`)'>".Settings::_("token","createtoken")."</a></ul>";
 	    	}
 		}
 		echo "</form>\n";
diff --git a/src/classes/LoginPage.php b/src/classes/LoginPage.php
index e734bea..4908849 100644
--- a/src/classes/LoginPage.php
+++ b/src/classes/LoginPage.php
@@ -84,17 +84,14 @@ public function toHTML(){
                     <input type='password' name='password' value='' placeholder='".Settings::_("login","pass")."'>
                     </div>
                  <div class='pure-control-group'>
-                    <input type='submit' class='pure-button pure-button-primary' value='".Settings::_("login","submit")."'>
-                </div>
-            </fieldset>
-            </form>\n";
+					<label></label>
+                    <input type='submit' class='pure-button pure-button-primary' value='".Settings::_("login","submit")."'>";
+
+		 			if (!Settings::$noregister){
+				       echo " ".Settings::_("login","or")." <a class='pure-button button-success' href='?t=Reg'>".Settings::_("login","register")."</a> ";
+				    }
 
-	   
-            if (!Settings::$noregister){
-               echo " <a class='pure-button button-success' href='?t=Reg'>".Settings::_("login","register")."</a> ".Settings::_("login","or");
-            }
-            echo " <a class='pure-button button-warning' href='.'>".Settings::_("login","back")."</a>"; echo "</fieldset></form>\n";
-            echo "</div>\n";
+            echo "</div>\n</fieldset>\n</form>\n</div>\n";
         }
     }
 }
diff --git a/src/classes/MainPage.php b/src/classes/MainPage.php
index 62307ac..8e4c145 100644
--- a/src/classes/MainPage.php
+++ b/src/classes/MainPage.php
@@ -131,13 +131,15 @@ public function toHTML(){
 
 		// Menu left
 		echo "<div id='menu'>\n";
-		echo "<span id='rss'><a href='?t=Rss'><i class='fa fa-rss fa-lg'></i></a></span>";
-		echo "<span id='logo'>".Settings::$name."</span>\n";
+		if(Settings::$rss){
+			echo "<span id='rss'><a href='?t=Rss' ".(Settings::$button_title ? "title='".Settings::_("buttons","rss")."'" : "")."><i class='fa fa-rss fa-lg'></i></a></span>";
+		}
+		echo "<span id='logo'><a href='/'>".Settings::$name."</a></span>\n";
 		echo "<div class='pure-menu menu pure-menu-open'>\n";
 		$this->menu->toHTML();
 		echo "</div></div>\n";
 
-		echo "<a href='#menuright' class='menuright-link'><span></span></a>";
+		echo "<a href='#menuright' class='menuright-link' ".(Settings::$button_title ? "title='".Settings::_("buttons","menuright")."'" : "")."><span></span></a>";
 		// Menu right
 		echo "<div id='menuright'>";
 		$this->menubar->toHTML();
diff --git a/src/classes/Menu.php b/src/classes/Menu.php
index 86ef658..2c67e81 100644
--- a/src/classes/Menu.php
+++ b/src/classes/Menu.php
@@ -82,7 +82,7 @@ public function __construct($dir=null,$level=0){
 		}
 
 		/// Set variables
-		$this->title = end(explode('/', $dir));
+		$this->title = mb_basename($dir);
 		$this->webdir= urlencode(File::a2r($dir));
 		$this->path  = File::a2r($dir);
 
@@ -138,12 +138,12 @@ public function toHTML(){
 
 			echo 	"<span class='name hidden'>".htmlentities($this->title, ENT_QUOTES ,'UTF-8')."</span>";
 			echo 	"<span class='path hidden'>".htmlentities($this->path, ENT_QUOTES ,'UTF-8')."</span>";
-			echo 	"<a href='?f=$this->webdir'>".htmlentities($this->title, ENT_QUOTES ,'UTF-8')."</a>";
-			echo 	"</li>\n";
+			echo 	"<a href='?f=" . $this->webdir . "'>".htmlentities($this->title, ENT_QUOTES ,'UTF-8')."</a>";
 
 			foreach($this->items as $item)
 				$item->toHTML();
 
+			echo 	"</li>\n";
 			echo 	"</ul>\n";
 		}	
 	}
@@ -200,7 +200,7 @@ public static function list_dirs($dir,$rec=false, $hidden=false){
 	 * @return void
 	 * @author Thibaud Rohmer
 	 */
-	public static function list_files($dir,$rec = false, $hidden = false, $stopatfirst = false){
+	public static function list_files($dir,$rec = false, $hidden = false, $stopatfirst = false, $all_file_type = false){
 		/// Directories list
 		$list=array();
 		
@@ -222,7 +222,7 @@ public static function list_files($dir,$rec = false, $hidden = false, $stopatfir
 			/// Content isn't hidden and is a file
 			if($content[0] != '.' || $hidden){
 				if(is_file($path=$dir."/".$content)){
-					if(File::Type($path) && (File::Type($path) == "Image" || File::Type($path)=="Video")){
+					if((File::Type($path) && (File::Type($path) == "Image" || File::Type($path)=="Video")) || $all_file_type){
 						/// Add content to list
 						$list[]=$path;
 
diff --git a/src/classes/MenuBar.php b/src/classes/MenuBar.php
index bde1f8a..d21cac3 100644
--- a/src/classes/MenuBar.php
+++ b/src/classes/MenuBar.php
@@ -77,11 +77,11 @@ public function toHTML(){
 			if(CurrentUser::$admin){
 				echo "<a class='pure-button button-small button-hidden hidden' href='?t=Adm'><i class='fa fa-cogs fa-lg' style='float:left;'></i> ".Settings::_("menubar","admin")."</a>";
 			}
-			echo "<a class='pure-button button-small button-hidden hidden' href='?t=Acc'><i class='fa fa-wrench fa-lg' style='float:left;'></i> Edit </a>";
+			echo "<a class='pure-button button-small button-hidden hidden' href='?t=Acc'><i class='fa fa-wrench fa-lg' style='float:left;'></i>".Settings::_("menubar","account")."</a>";
 			echo "<a class='pure-button button-small button-hidden hidden' href='?t=Logout'><i class='fa fa-sign-out fa-lg' style='float:left;'></i> ".Settings::_("menubar","logout")."</a>\n";
 			
 		}else{
-			echo "<a class='pure-button button-small' href='#'><i class='fa fa-user fa-lg' style='float:left;'></i> Not logged in ! <div style='float:right;'><i class='fa fa-caret-down fa-lg'></i></div></a>";
+			echo "<a class='pure-button button-small' href='#'><i class='fa fa-user fa-lg' style='float:left;'></i>".Settings::_("menubar","not_logged")."<div style='float:right;'><i class='fa fa-caret-down fa-lg'></i></div></a>";
 
 			// User not logged in
 			echo "<a class='pure-button button-small  button-hidden hidden' href='?t=Login'><i class='fa fa-sign-in fa-lg' style='float:left;'></i> ".Settings::_("menubar","login")."</a>";
diff --git a/src/classes/Page.php b/src/classes/Page.php
index 5313110..1a82731 100644
--- a/src/classes/Page.php
+++ b/src/classes/Page.php
@@ -53,7 +53,7 @@ abstract class Page implements HTMLObject
 		 * @author Thibaud Rohmer
 		 */
 		public function header($head_content=NULL){
-			echo "<!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.01//EN' 'http://www.w3.org/TR/html4/strict.dtd'>\n";
+			echo "<!DOCTYPE html>";
 			echo "<html>";
 			echo "<head>\n";
 			echo "<meta http-equiv='Content-Type' content='text/html; charset=utf-8'>\n";
@@ -67,12 +67,12 @@ public function header($head_content=NULL){
 			echo "<link rel='stylesheet' href='inc/stylesheets/pure-grid.css'>\n";
 			echo "<link rel='stylesheet' href='inc/stylesheets/font-awesome.min.css'>\n";
 			
-			echo "<link rel='stylesheet' href='src/stylesheets/structure.css' type='text/css' media='screen' charset='utf-8'>\n";
-			echo "<link rel='stylesheet' href='src/stylesheets/buttons.css' type='text/css' media='screen' charset='utf-8'>\n";
-			echo "<link rel='stylesheet' href='src/stylesheets/theme.css' type='text/css' media='screen' charset='utf-8'>\n";
-			echo "<link rel='stylesheet' href='src/stylesheets/side-menu.css' type='text/css' media='screen' charset='utf-8'>\n";
+			echo "<link rel='stylesheet' href='src/stylesheets/structure.css' type='text/css' media='screen'>\n";
+			echo "<link rel='stylesheet' href='src/stylesheets/buttons.css' type='text/css' media='screen'>\n";
+			echo "<link rel='stylesheet' href='src/stylesheets/theme.css' type='text/css' media='screen'>\n";
+			echo "<link rel='stylesheet' href='src/stylesheets/side-menu.css' type='text/css' media='screen'>\n";
 
-			echo "<link rel='stylesheet' href='user/themes/".Settings::$user_theme."/style.css' type='text/css' media='screen' charset='utf-8'>\n";
+			echo "<link rel='stylesheet' href='user/themes/".Settings::$user_theme."/style.css' type='text/css' media='screen'>\n";
 
 			/// Trick to hide "only-script" parts
 	 		echo "<noscript><style>.noscript_hidden { display: none; }</style></noscript>";
@@ -92,11 +92,12 @@ public function header($head_content=NULL){
 			echo "<script src='src/js/slideshow.js'></script>\n";
 			echo "<script src='src/js/image_panel.js'></script>\n";
 			echo "<script src='src/js/keyboard.js'></script>\n";
+			echo "<script src='src/js/confirmation.js'></script>\n";
 
 
 
 			if(CurrentUser::$admin || CurrentUser::$uploader){
-				echo "<link rel='stylesheet' href='inc/fileupload-ui.css' type='text/css' media='screen' charset='utf-8'>\n";
+				echo "<link rel='stylesheet' href='inc/fileupload-ui.css' type='text/css' media='screen'>\n";
 				echo "<script src='inc/jquery.fileupload-ui.js'></script>\n";
 				echo "<script src='src/js/admin.js'></script>\n";
 			}
diff --git a/src/classes/Provider.php b/src/classes/Provider.php
index e632ee4..cc3fad9 100755
--- a/src/classes/Provider.php
+++ b/src/classes/Provider.php
@@ -66,7 +66,7 @@ public static function get_orientation_degrees ($filename)
 					break;
 				case 5:
 				case 6: 
-					$degrees = -90; 
+					$degrees = 270; 
 					break;
 				case 7:
 				case 8: 
@@ -90,7 +90,7 @@ private static function autorotate_jpeg ($filename)
 	{
 		$raw_image = imagecreatefromjpeg($filename);
 		$degrees = Provider::get_orientation_degrees ($filename);
-		if($degrees > 0){
+		if($degrees != 0){
 			$rotated_image = imagerotate($raw_image, $degrees, 0);
 			if($rotated_image == NULL){
 				return $raw_image;
@@ -218,10 +218,10 @@ public static function thumb($file)
         /// If we need to create a thumb, then this is a new picture
         if (!$goodThumb) {
 
-            if (Judge::is_public($file)) {
+            if (Judge::is_public($file) && Settings::$rss) {
                 $r = new RSS(Settings::$conf_dir."/photos_feed.txt");
                 $webpath = Settings::$site_address."?f=".urlencode(File::a2r($file));
-                $r->add(basename($file),$webpath, "<img src='$webpath&t=Thb' />");
+                $r->add(mb_basename($file),$webpath, "<img src='$webpath&t=Thb' />");
             }
 
             /// Create directories
@@ -243,7 +243,7 @@ public static function thumb($file)
 
             if (File::Type($file) == 'Image' && Provider::get_orientation_degrees($file) != 0) {
                 $thumb->SourceImageToGD();
-                //$thumb->ra = Provider::get_orientation_degrees($file);
+                $thumb->ra = 360 - Provider::get_orientation_degrees($file);
                 $thumb->Rotate();
             }
 
@@ -293,7 +293,7 @@ public static function small($file)
 
             if (File::Type($file) == 'Image' && Provider::get_orientation_degrees($file) != 0) {
                 $thumb->SourceImageToGD();
-                //$thumb->ra = Provider::get_orientation_degrees($file);
+                $thumb->ra = 360 - Provider::get_orientation_degrees($file);
                 $thumb->Rotate();
             }
 
@@ -362,7 +362,7 @@ public static function Image($file,$thumb=false,$large=false,$output=true,$dl=fa
 
         if($output){
 			if($dl){
-				header('Content-Disposition: attachment; filename="'.basename($file).'"');
+				header('Content-Disposition: attachment; filename="'.mb_basename($file).'"');
 			}else{
 				$expires = 60*60*24*14;
 				$last_modified_time = filemtime($path); 
@@ -483,7 +483,7 @@ public static function Zip($dir){
 
 		// Close and send to user
 		header('Content-Type: application/zip');
-		header("Content-Disposition: attachment; filename=\"".htmlentities(basename($dir), ENT_QUOTES ,'UTF-8').".zip\"");
+		header("Content-Disposition: attachment; filename=\"".mb_basename($dir).".zip\"");
 
                 // Store the current working directory and change to the albums directory
 		$cwd = getcwd();
diff --git a/src/classes/RSS.php b/src/classes/RSS.php
index b790aa0..ec97595 100644
--- a/src/classes/RSS.php
+++ b/src/classes/RSS.php
@@ -76,8 +76,10 @@ public function clean(){
 	}
 
 	public function toXML(){
+		if(!Settings::$rss)
+			return;
+
 		$this->clean();
-		if(Settings::$rss);
 		header("Content-type: text/xml"); 
 		echo "<?xml version='1.0' encoding='UTF-8'?> 
 <rss version='2.0'>
diff --git a/src/classes/RegisterPage.php b/src/classes/RegisterPage.php
index 08c8d8c..10190b8 100644
--- a/src/classes/RegisterPage.php
+++ b/src/classes/RegisterPage.php
@@ -70,7 +70,10 @@ public function __construct($admin_account = false, $included = false){
 	 */
     public function toHTML(){
 
-        if (Settings::$forcehttps && !$_SERVER["HTTPS"]){
+        if (!$this->included && Settings::$noregister) {
+            header("Location: /?t=Login");
+            exit();
+        }elseif (Settings::$forcehttps && !$_SERVER["HTTPS"]){
             header("HTTP/1.1 301 Moved Permanently");
             header("Location: https://".$_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"]);
             exit();
diff --git a/src/classes/Settings.php b/src/classes/Settings.php
index 7b8c7d4..3dec514 100644
--- a/src/classes/Settings.php
+++ b/src/classes/Settings.php
@@ -90,6 +90,9 @@ class Settings extends Page
 	/// Remove comments button
 	static public $nocomments 	=	false;
 
+	/// Remove description option
+	static public $nodescription 	=	false;
+
 	/// Remove registering options
 	static public $noregister	=	false;
     
@@ -120,6 +123,9 @@ class Settings extends Page
 	/// Activate l33t
 	static private $l33t 		=	false;
 
+	/// Activate title on buttons
+	static public $button_title	=	false;
+
 	/**** Other ****/
 
 	/// Folders list
@@ -254,10 +260,12 @@ static public function init($forced = false, $config_file = NULL){
 			Settings::$noregister	=	isset($admin_settings['noregister']);
 			Settings::$forcehttps   =   isset($admin_settings['forcehttps']);
 			Settings::$nocomments	=	isset($admin_settings['nocomments']);
+			Settings::$nodescription	=	isset($admin_settings['nodescription']);
 			Settings::$nodownload	=	isset($admin_settings['nodownload']);
 			Settings::$l33t 		=	isset($admin_settings['l33t']);
 			Settings::$reverse_menu	=	isset($admin_settings['reverse_menu']);
 			Settings::$rss	=	isset($admin_settings['rss']);
+			Settings::$button_title	=	isset($admin_settings['button_title']);
 
 
 
@@ -374,6 +382,7 @@ public static function set(){
             "noregister",
             "forcehttps",
             "nocomments",
+            "nodescription",
             "nodownload",
             "loc",
             "l33t",
@@ -383,7 +392,8 @@ public static function set(){
 	    "ffmpeg_option",
 	    "user_theme",
 	    "thumbs_size",
-   	    "rss"
+   	    "rss",
+	    "button_title"
 	    );
 		$f = fopen(Settings::$admin_settings_file,"w");
 
@@ -424,12 +434,12 @@ public static function gener_all($folder){
 	public function toHTML(){
 
  		echo "<div class='header'>";
- 		echo "<h1>Settings</h1>";
+ 		echo "<h1>".Settings::_("settings","settings")."</h1>";
  		echo "</div>";
 
 		/// Site Title
 		echo "<form class='niceform pure-form pure-form-aligned' action='?t=Adm&a=Set' method='post'>\n";
-		echo "<h2>Global</h2>
+		echo "<h2>".Settings::_("settings","global")."</h2>
 				<div class='pure-control-group'>
 					<label for='name'>".Settings::_("settings","title")."</label>
 					<input type='text' name='name' value=\"".htmlentities(Settings::$name, ENT_QUOTES ,'UTF-8')."\">
@@ -471,8 +481,8 @@ public function toHTML(){
 		echo "</select>";			
 		echo "</div>";
 
-		echo "<h2>Options</h2>";
-		$options = array("noregister","forcehttps","nocomments","nodownload","reverse_menu","l33t","rss");
+		echo "<h2>".Settings::_("settings","options")."</h2>";
+		$options = array("noregister","forcehttps","nocomments","nodescription","nodownload","reverse_menu","l33t","rss","button_title");
 		foreach($options as $val){
 			$c = (Settings::$$val)?"checked":"";
 				echo "<div class='pure-controls'><label><input type='checkbox' name='$val' $c> ".Settings::_("settings",$val)."</label></div>\n";
@@ -488,15 +498,15 @@ public function toHTML(){
 		/// Thumbs size
 		echo "<div class='pure-control-group'>
 					<label>".Settings::_("settings","thumbs_size")."</label>
-					<input type='text' name='max_img_dir' value=\"".htmlentities(Settings::$thumbs_size, ENT_QUOTES ,'UTF-8')."\">
+					<input type='text' name='thumbs_size' value=\"".htmlentities(Settings::$thumbs_size, ENT_QUOTES ,'UTF-8')."\">
 				</div>\n";
 
-		echo "<h2>Social Networks</h2>";
+		echo "<h2>".Settings::_("settings","s_networks")."</h2>";
 
 		/// Facebook Button
 		$c = (Settings::$like)?"checked":"";
 		echo "<div class='pure-controls'>
-				<label><input type='checkbox' name='like' $c>".Settings::_("settings","fb")."</label>
+				<label><input type='checkbox' name='like' $c> ".Settings::_("settings","fb")."</label>
 			</div>\n";
 
 
@@ -505,14 +515,14 @@ public function toHTML(){
 					<label>".Settings::_("settings","facebook_appid")."</label>
 					<input type='text' name='fbappid' value=\"".htmlentities(Settings::$fbappid, ENT_QUOTES ,'UTF-8')."\">
 				</div>";
-		echo "<h2>Video</h2>";
 
+		echo "<h2>".Settings::_("settings","video")."</h2>";
 
 		/// Encode Video
 		echo "<span>".Settings::_("settings","video_comment")."</span>";
 		echo "<div class='pure-controls'>";
 		$c = (Settings::$encode_video)?"checked":"";
-		echo "<label><input type='checkbox' name='encode_video' $c>Encode Video</label>\n";
+		echo "<label><input type='checkbox' name='encode_video' $c> ".Settings::_("settings","encode_video")."</label>\n";
 		echo "</div>";
 
 		
@@ -543,7 +553,7 @@ public function toHTML(){
 		echo "<option value='.'>".Settings::_("settings","all")."</option>";
 		foreach($this->folders as $f){
 			$p = htmlentities(File::a2r($f), ENT_QUOTES ,'UTF-8');
-			echo "<option value=\"".addslashes($p)."\">".basename($p)."</option>";
+			echo "<option value=\"".addslashes($p)."\">".mb_basename($p)."</option>";
 		}
 		echo "</select>";
 		echo "<input type='submit' class='pure-button pure-button-primary' value='".Settings::_("settings","submit")."'/>\n";
diff --git a/src/classes/Video.php b/src/classes/Video.php
index c5b681c..944cc7b 100644
--- a/src/classes/Video.php
+++ b/src/classes/Video.php
@@ -50,7 +50,7 @@ class Video implements HTMLObject
 	 * Create Video
 	 *
 	 * @param string $file 
-	 * @author Cédric Levasseur
+	 * @author C�dric Levasseur
 	 */
 	public function __construct($file=NULL,$forcebig = false){
 	
@@ -77,7 +77,7 @@ public function __construct($file=NULL,$forcebig = false){
 	 *
 	 * @param string $file 
      * @return pid of the executed command (only linux)
-	 * @author Cédric Levasseur/Franck Royer
+	 * @author C�dric Levasseur/Franck Royer
 	 */	
 	public function ExecInBackground($cmd) {	
 		error_log('DEBUG/Video: Background Execution : '.$cmd,0);
@@ -103,7 +103,7 @@ public function GetDuration($file){
         }
 
         //TODO Windows
-        exec(Settings::$ffmpeg_path.' -i '.$file.' 2>&1|grep Duration', $output);
+        exec(Settings::$ffmpeg_path.' -i '.escapeshellarg($file).' 2>&1|grep Duration', $output);
         $duration = $output[0];
 
         $duration_array = explode(':', $duration);
@@ -126,15 +126,12 @@ public function GetScaledDimension($file, $x = 0, $y = 0){
         }
 
         //TODO Windows
-        exec(Settings::$ffmpeg_path." -i ".$file." 2>&1|grep 'Stream #...([^)]*): Video:'", $output);
+        exec(Settings::$ffmpeg_path." -i ".escapeshellarg($file)." 2>&1|grep 'Stream #...([^)]*): Video:'", $output);
         $line = $output[0];
-        preg_match('/ [0-9]+x[0-9]+/', $line, $matches);
-        $match = $matches[0];
+        preg_match('/, ([0-9]+)x([0-9]+), /', $line, $matches);
+        $orig_x = intval($matches[1]);
+        $orig_y = intval($matches[2]);
 
-
-        $dimensions_array = explode('x', $match);
-        $orig_x = intval($dimensions_array[0]);
-        $orig_y = intval($dimensions_array[1]);
         //error_log('DEBUG/Video: dimension of '.$file.' is '.$orig_x.'x'.$orig_y);
 
         //If for some reason ffmpeg cannot get the dimension
@@ -164,11 +161,11 @@ public function GetScaledDimension($file, $x = 0, $y = 0){
 	
 	
 	/**
-	 * Asynchronous Convert all Video format to video/mp4
+	 * Asynchronous Convert all Video format to video/mp4
 	 *   
 	 * Use ffmpeg for conversion
 	 * @return void
-	 * @author Cédric Levasseur
+	 * @author C�dric Levasseur
 	 */
     public static function FastEncodeVideo($file) {
 
@@ -179,13 +176,13 @@ public static function FastEncodeVideo($file) {
 
         $file_file	       = new File($file);
         $thumb_path_no_ext = Settings::$thumbs_dir.dirname(File::a2r($file))."/".$file_file->name;
-        $thumb_path_mp4   = $thumb_path_no_ext.'.mp4';
+        $thumb_path_mp4   = $thumb_path_no_ext.'.mp4';
         $thumb_path_jpg    = $thumb_path_no_ext.'.jpg';	
 
 
         // Check if thumb folder exist
-        if(!file_exists(dirname($thumb_path_mp4))){
-            @mkdir(dirname($thumb_path_mp4),0755,true);
+        if(!file_exists(dirname($thumb_path_mp4))){
+            @mkdir(dirname($thumb_path_mp4),0755,true);
         }
 
 
@@ -196,23 +193,23 @@ public static function FastEncodeVideo($file) {
             $offset = self::GetDuration($file)/2;
             $dimensions = self::GetScaledDimension($file, 320);
             
-            $u=Settings::$ffmpeg_path.' -itsoffset -'.$offset.'  -i "'.$file.'" -vcodec mjpeg -vframes 1 -an -f rawvideo -s '.$dimensions['x'].'x'.$dimensions['y'].' -y "'.$thumb_path_jpg.'"';
+            $u=Settings::$ffmpeg_path.' -itsoffset -'.$offset.'  -i '.escapeshellarg($file).' -vcodec mjpeg -vframes 1 -an -f rawvideo -s '.$dimensions['x'].'x'.$dimensions['y'].' -y '.escapeshellarg($thumb_path_jpg);
             self::ExecInBackground($u);
         }
 
         if (self::NoJob($file))// We check that first to allow the clean of old job files
         {
-            if (!file_exists($thumb_path_mp4) || filectime($file) > filectime($thumb_path_mp4)){
-                if ($file_file->extension !="mp4") {
-                    ///Convert video to mp4 format in Thumbs folder
+            if (!file_exists($thumb_path_mp4) || filectime($file) > filectime($thumb_path_mp4)){
+                if ($file_file->extension !="mp4") {
+                    ///Convert video to mp4 format in Thumbs folder
                     //TODO: Max job limit
-                    $u = Settings::$ffmpeg_path.' -i "'.$file.'" '.Settings::$ffmpeg_option.' -y "'.$thumb_path_mp4.'"';
+                    $u = Settings::$ffmpeg_path.' -i '.escapeshellarg($file).' '.Settings::$ffmpeg_option.' -y '.escapeshellarg($thumb_path_mp4);
                     $pid = self::ExecInBackground($u);
                     self::CreateJob($file, $pid);
                 }
                 else {
-                    ///Copy original mp4 video to Thumbs folder
-                    copy($file,$thumb_path_mp4);
+                    ///Copy original mp4 video to Thumbs folder
+                    copy($file,$thumb_path_mp4);
                 }
             }
         }
@@ -300,7 +297,7 @@ public function VideoDiv($width='100%',$height='100%',$control=false){
         if ($control) {
             $c = ' controls="controls"';
         }
-        echo '<video'.$wh.$c.'><source src="?t=Vid&f='.$this->fileweb.'" type="video/mp4"/>';
+        echo '<video'.$wh.$c.'><source src="?t=Vid&f='.$this->fileweb.'" type="video/mp4"/>';
         echo 'Your browser does not support the video tag.<br />';
         echo 'Please upgrade your brower or Download the codec <a href="http://tools.google.com/dlpage/webmmf">Download</a>';
         echo '</video>';
@@ -311,10 +308,10 @@ public function VideoDiv($width='100%',$height='100%',$control=false){
 	 * Display the video on the website
 	 *
 	 * @return void
-	 * @author Cédric Levasseur
+	 * @author C�dric Levasseur
 	 */
 	public function toHTML(){	
-        self::VideoDiv(320,'',true);
+        self::VideoDiv(400,400,true);
 	}
 
 }
diff --git a/src/js/confirmation.js b/src/js/confirmation.js
new file mode 100644
index 0000000..383f0e7
--- /dev/null
+++ b/src/js/confirmation.js
@@ -0,0 +1,54 @@
+/**
+ * This file implements a confirmation dialog.
+ * 
+ * Javascript
+ *
+ * LICENSE:
+ * 
+ * This file is part of PhotoShow.
+ *
+ * PhotoShow 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PhotoShow 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 PhotoShow.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package	  PhotoShow
+ * @category  Website
+ * @author	  Thibaud Rohmer <thibaud.rohmer@gmail.com>
+ * @copyright 2011 Thibaud Rohmer
+ * @license	  http://www.gnu.org/licenses/
+ * @link	  http://github.com/thibaud-rohmer/PhotoShow
+ */
+
+function executeOnSubmit(button)
+{
+	switch(button){
+		case 'rename':
+		case 'create':
+		case 'download':
+		case 'delete':
+			var res = confirm("Do you really wish to "+button+" this item?")
+			break;
+		case 'permissions':
+			var res = confirm("Do you want to change Permissions?")
+			break;
+		case 'token':
+			var res = confirm("Do you want to create a guest token?")
+			break;
+		case 'tokenDelete':
+			var res = confirm("Do you want to delete this guest token?")
+			break;
+	};
+    if(res)
+		return true;
+   	else
+       	return false;
+}
\ No newline at end of file
diff --git a/src/js/image_panel.js b/src/js/image_panel.js
index 2b23009..1fc5a37 100644
--- a/src/js/image_panel.js
+++ b/src/js/image_panel.js
@@ -170,6 +170,7 @@ function init_image_panel(){
 	$(".linear_panel").scrollTo($(".linear_panel .selected")).scrollTo("-="+$(".linear_panel").width()/2);
 
 	init_comments();
+	init_description();
 	init_slideshow_panel();
 }
 
@@ -183,6 +184,15 @@ function init_comments(){
 	});
 }
 
+function init_description(){
+	$("#description_form form").submit(function(){
+		$.post($(this).attr('action') + "&j=Desc",$(this).serialize(),function(data){
+			$('.description').html(data);
+		});
+		return false;
+	});
+}
+
 $("document").ready(function(){
 	init_image_panel();
 });
\ No newline at end of file
diff --git a/src/js/keyboard.js b/src/js/keyboard.js
index 1ca34bd..56aded7 100644
--- a/src/js/keyboard.js
+++ b/src/js/keyboard.js
@@ -30,6 +30,10 @@
 $("document").ready(function(){
 	$("body").keyup(function(event){
 	var keyCode = event.which;
+
+	if ($(event.target).is("input") || $(event.target).is("textarea"))
+		return;
+
 	if (keyCode == 0 && event.keyCode != undefined)
 		keyCode = event.keyCode;
 	
@@ -68,7 +72,9 @@ $("document").ready(function(){
 				break;
 
 			case $.ui.keyCode.ESCAPE :
-				if($("#image_bar #stop").is(":visible")){
+				if($("#image_bar #back").is(":visible")){
+					$("#image_bar #back").click();
+				}else if($("#image_bar #stop").is(":visible")){
 					$("#image_bar #stop").click();
 				}
 				event.preventDefault();
diff --git a/src/stylesheets/side-menu.css b/src/stylesheets/side-menu.css
index 9bbab3e..8ca16d5 100644
--- a/src/stylesheets/side-menu.css
+++ b/src/stylesheets/side-menu.css
@@ -162,7 +162,7 @@ This is the parent `<div>` that contains the menu and the content area.
 }
 
 .menuright-link {
-    right: 0; /* "#menu width" */
+    right: 10px; /* "#menu width" */
 }
 
 .header {
diff --git a/src/stylesheets/structure.css b/src/stylesheets/structure.css
index 700ff5a..c4ad9eb 100644
--- a/src/stylesheets/structure.css
+++ b/src/stylesheets/structure.css
@@ -57,7 +57,7 @@ h3{
 span#rss{
 	position: absolute;
 	top: 15px;
-	right : -4px;
+	right : 4px;
 	z-index:200;
 	background: orange;
 	padding: 8px;
@@ -80,6 +80,10 @@ span#logo{
 	height: 60px;
 	overflow: hidden;
 }
+span#logo a{
+	text-decoration: none;
+	color: inherit;
+}
 
 div#menuright-header{
 	border-bottom: 1px solid #e0e0e0;
@@ -98,7 +102,7 @@ div#menuright-header{
 	margin:auto;
 	overflow:hidden;
     font-family: "Roboto-Regular", sans-serif;
-    margin: 0 auto;
+    margin: 0 15px 0 0;
     background-color: #00bcd4;
     height: 60px;
     box-shadow: 0 2px 5px rgba(0,0,0,.26);
@@ -173,7 +177,6 @@ div.directory .dirname
 
 div.directory img{
 	width:100%;
-	max-height: 150px;
 }
 
 /* Linear Panel */
@@ -195,7 +198,8 @@ div.linear_panel {
 .linear_panel  h1,
 .linear_panel  h2,
 .linear_panel > .sectionvid,
-.linear_panel > .sectiondir
+.linear_panel > .sectiondir,
+.linear_panel > .description
 {
 	display: none !important;
 }
@@ -253,6 +257,7 @@ left:0;
 right:0;
 z-index:10;
 box-shadow: 0 2px 5px rgba(0,0,0,.35);
+overflow: auto;
 }
 
 div.image_panel * a,
@@ -265,21 +270,24 @@ padding: 20px 5px 0px 5px;
 font-size: 10pt;
 }
 
+div#image_panel_table {
+	display: table;
+	width: 100%;
+	height: 100%;
+	border-spacing: 5px;
+	margin-top: -5px;
+}
+
 	
-div#bigimage{
-	position:absolute;
-	top:0;
-	right:0;
-	bottom:35px;
-	left:0;
+div#bigimage,
+div#bigvideo{
+	display: table-row;
+	width: 100%;
+	height: 100%;
 }
 
 div#image_bar {
-position: absolute;
-left: 0;
-right: 0;
-height: 30px;
-bottom: 0;
+display: table-row;
 font-size: 15px;
 text-align: center;
 }
@@ -289,6 +297,18 @@ display: inline-block;
 width: 50px;
 }
 
+div#loading_spin {
+text-align: center;
+position: relative;
+top: 50%;
+transform: translateY(-50%);
+}
+
+div#bigvideo > video {
+min-width: 100%;
+min-height: 100%;
+}
+
 
 /* Comments */
 
@@ -318,7 +338,11 @@ div.commentdelete {
 
 
 /* Menu */
-ul.selected > ul{
+.pure-menu {
+	padding-bottom: 20px;
+}
+
+ul.selected > li > ul{
 	position: relative;
 	visibility: visible;
 	left: auto;
@@ -336,7 +360,7 @@ li {
 	padding: 0;
 }
 
-.pure-menu li a{
+.pure-menu a{
 	font-family: 'Roboto-Bold',sans-serif;
 	font-size: 13px;
 	color: black;
@@ -346,7 +370,7 @@ li.currentSelected{
 
 }
 
-li.currentSelected a{
+li.currentSelected > a{
 	color: #0085be !important;
 }
 
@@ -405,3 +429,23 @@ div#deleteform{
 	top: 20px;
 }
 
+.infos .pure-g > .pure-u-1-2 > input[type=text] {
+	width: 100%;
+}
+
+/* Description */
+
+.panel > .description{
+	padding-left: 40px;
+	padding-top: 20px;
+	font-size: 22px;
+}
+
+#image_panel_table > .description{
+	display: table-row;
+	text-align: center;
+}
+
+.description:empty{
+	display: none !important;
+}