diff --git a/private/lib/AnalyticsHelper.php b/private/lib/AnalyticsHelper.php
index 09e8ba9..b47f38e 100644
--- a/private/lib/AnalyticsHelper.php
+++ b/private/lib/AnalyticsHelper.php
@@ -6,8 +6,6 @@ Creation Date:	27/gen/2016
 
 class AnalyticsHelper {
 	private static $COOKIE_NAME = "FDN_STAT_NUM";
-	//TODO: Switch this value to +1 year in production environment
-// 	private static $COOKIE_TIME = "+5 minutes";
 	private static $COOKIE_TIME = "+1 year";
 	
 	/**
diff --git a/private/lib/dao/models/NotiziaModel.php b/private/lib/dao/models/NotiziaModel.php
index e0d1952..1c816d2 100644
--- a/private/lib/dao/models/NotiziaModel.php
+++ b/private/lib/dao/models/NotiziaModel.php
@@ -40,6 +40,7 @@ class NotiziaModel extends HasMediaModel{
 	const CATEGORY_SALUTE = 11;
 	const CATEGORY_ANNUNCI = 12;
 	const CATEGORY_FISCOELAVORO = 13;
+	const CATEGORY_RUBRICHE = 14;
 	
 	public static $NOTIZIE_CATEGORY = array(
 			self::CATEGORY_POLITICA=>array("label"=>"Politica","mainMenu"=>true,"hidden"=>false,"pages"=>array("list"=>"politica.php")),
@@ -54,7 +55,8 @@ class NotiziaModel extends HasMediaModel{
 			self::CATEGORY_CASA=>array("label"=>"Casa","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"casa.php")),
 			self::CATEGORY_SALUTE=>array("label"=>"Salute","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"salute.php")),
 			self::CATEGORY_ANNUNCI=>array("label"=>"Annunci","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"annunci.php")),
-			self::CATEGORY_FISCOELAVORO=>array("label"=>"Fisco e Lavoro","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"fiscoelavoro.php"))
+			self::CATEGORY_FISCOELAVORO=>array("label"=>"Fisco e Lavoro","mainMenu"=>false, "hidden"=>true,"pages"=>array("list"=>"fiscoelavoro.php")),
+			self::CATEGORY_RUBRICHE=>array("label"=>"Rubriche","mainMenu"=>false, "hidden"=>false,"pages"=>array("list"=>"rubriche.php"))
 	);
 	
 	public static function getCollectionName(){
diff --git a/public/admin/editNotizie.php b/public/admin/editNotizie.php
index 08e84d8..db0f0c1 100644
--- a/public/admin/editNotizie.php
+++ b/public/admin/editNotizie.php
@@ -88,9 +88,6 @@ try{
 			}
 		}
 	}
-	else{
-		echo "post nullo";
-	}
 }catch(GUIException $ex){
 	$error = $ex->getMessage();
 }catch (Exception $exec){
diff --git a/public/articolo.php b/public/articolo.php
index 0892ca4..75d7f26 100644
--- a/public/articolo.php
+++ b/public/articolo.php
@@ -207,14 +207,14 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
 						</script>
 						<?php 
 								$i=0;
-								foreach($medias as $mediaImage){?>
-									<div class="carosImage mediaContent">
-										<span class="helper"></span>
-										<div style="display:inline-block;" onclick="javascript:loadImage('<?php echo $i;?>')"><?php $mediaImage->renderMedia(array("size"=>MediaRenderer::SIZE_MINI,"clickable"=>true));?></div>
-									</div>
-								<?php if($mediaImage->mediaType == MediaModel::TYPE_IMAGE){
+								foreach($medias as $mediaImage){
+									if($mediaImage->mediaType == MediaModel::TYPE_IMAGE){
 										$imageArray = getimagesize($mediaImage->getRenderer()->getImageLink(array("size"=>MediaRenderer::SIZE_BIG)));
-								?>	
+										?>	
+											<div class="carosImage mediaContent">
+												<span class="helper"></span>
+												<div style="display:inline-block;" onclick="javascript:loadImage('<?php echo $i;?>')"><?php $mediaImage->renderMedia(array("size"=>MediaRenderer::SIZE_MINI,"clickable"=>true));?></div>
+											</div>
 											<script type="text/javascript">
 												var ele ={
 															src: '<?php echo GUIHandler::getBaseUrl()."getImage.php?id=".$mediaImage->id."&size=".MediaRenderer::SIZE_BIG;?>',
@@ -223,9 +223,17 @@ GUIHandler::generateHtmlHeaders(array("additionalHeaders"=>$additionalHeaders));
 														}
 												items.push(ele);
 											</script>						
-							<?php
+										<?php
 										$i++;	
-										}
+									}
+									else {
+										?>
+											<div class="carosImage mediaContent">
+												<span class="helper"></span>
+												<div style="display:inline-block;" ><?php $mediaImage->renderMedia(array("size"=>MediaRenderer::SIZE_MINI,"clickable"=>true));?></div>
+											</div>
+										<?php 
+									}
 								}
 							?>
 						</div>
diff --git a/public/style/admin.css b/public/style/admin.css
index 80a943b..62913aa 100644
--- a/public/style/admin.css
+++ b/public/style/admin.css
@@ -2,7 +2,7 @@
 
 .hidden{display:none;}
 
-#admin_menu{position:fixed; left:0; top:0; bottom:0; width:300px; background-color:#393939; display:inline-block;}
+#admin_menu{position:fixed; left:0; top:0; bottom:0; width:15%; min-width:180px; background-color:#393939; display:inline-block;}
 
 #admin_menu ul{list-style: none; width:100%; border:0; margin:0; padding:0; display:block; overflow:hidden;}
 #admin_menu ul li{width:100%; height:50px; display:inline-block;}
@@ -12,8 +12,12 @@
 #admin_menu ul ul li a{padding-left:25px; }
 #admin_menu ul ul{height:0px;}
 
+
 .admin_head{margin-left:300px; text-align:center;}
-.admin_head + div{margin-left:300px; padding: 20px; position:relative;min-height:50px;}
+.admin_head + div{padding: 20px; position:relative;min-height:50px;}
+
+body:before{content: ""; float:left; width:15%; min-width: 180px; height:100vh; min-height:600px;}
+body > div {overflow:hidden;}
 
 
 table.dataTable th{text-align:left; }
@@ -27,6 +31,10 @@ table.dataTable tr.even td{background-color:rgba(126, 151, 214, 0.4); }
 .deletionConfirm a {text-decoration: none;color: #36F;font-weight: bold;margin-right: 5px;padding: 5px;display: inline-block;}
 .deletionConfirm a:hover{background-color: #FFABAB;}
 
+.mediaContent{overflow:hidden;}
+.mediaContent *{max-height:100%;max-width:100%;}
+.mediaContent > a{height:100%; width:100%;display:inline-block;}
+
 /*
  _                _         ____                  
 | |    ___   __ _(_)_ __   |  _ \ __ _  __ _  ___ 
@@ -92,7 +100,7 @@ div.notiziaStat >div > div {text-align:center;}
 
 */
 .mediaElement.mainElement{background-color:yellow;}
-.mediaElement{display:inline-block; padding:15px;}    
+.mediaElement{display:inline-block; padding:15px; max-width:160px;}    
 .mediaElement.selected {opacity:0.4;background-color:orange;}
 
 /*