diff --git a/private/lib/gui/GUIHandler.php b/private/lib/gui/GUIHandler.php
index 18d4b20..808b6e5 100644
--- a/private/lib/gui/GUIHandler.php
+++ b/private/lib/gui/GUIHandler.php
@@ -262,8 +262,8 @@ class GUIHandler {
 	}
 	
 	public static function getTwitterShareFunction(NotiziaModel $notizia){
-		$url = self::getBaseUrl()."fbMetadata.php?id=".$notizia->id;
-		return 'window.open("http://www.facebook.com/sharer.php?u="+encodeURIComponent("'.$url.'"))';
+		$url = self::getBaseUrl()."articolo.php?id=".$notizia->id;
+		return 'window.open("http://twitter.com/home?source=ifdn&status="+encodeURIComponent("'.$url.'"))';
 	}
 	
 	public static function getGooglePlusShareFunction(NotiziaModel $notizia){
diff --git a/public/articolo.php b/public/articolo.php
index 41e6aa2..00062d2 100644
--- a/public/articolo.php
+++ b/public/articolo.php
@@ -29,6 +29,13 @@ try {
 	
 	$data = date("d",$articolo->about->data->sec)." ".$mesi[date("n",$articolo->about->data->sec)]." ".date("Y",$articolo->about->data->sec);
 
+	$mediaMetaInfo = '';
+	if ($media->mediaType == MediaModel::TYPE_LOCALVIDEO || $media->mediaType == MediaModel::TYPE_YOUTUBE){
+		$mediaMetaInfo = 'itemprop="video"';
+	}
+	else if ($media->mediaType == MediaModel::TYPE_IMAGE){
+		$mediaMetaInfo = 'itemprop="image"';
+	}
 }catch(GUIException $ex){
 	$error = $ex->getMessage();
 }catch (Exception $exec){
@@ -38,7 +45,7 @@ try {
 	GUIHandler::redirect("index.php");
 }
 ?>
-<div style="width:1000px;margin-left:auto;margin-right:auto;">
+<div style="width:1000px;margin-left:auto;margin-right:auto;" itemscope itemtype="http://schema.org/Article">
 <?php 	
 	GUIHandler::generateHeadPublic();
 	GUIHandler::generateMenu();	
@@ -46,22 +53,22 @@ try {
 	<div class="articoloCategory">
 		<div class="categoryStyle">
 			<div class="icon"><img alt="" src="images/categoryIcon.png"></div>
-			<div class="articoloCategoryName"><span><?php echo strtoupper(NotiziaModel::$NOTIZIE_CATEGORY[$articolo->category]["label"]);?></span></div>
+			<div class="articoloCategoryName"><span itemprop="articleSection"><?php echo strtoupper(NotiziaModel::$NOTIZIE_CATEGORY[$articolo->category]["label"]);?></span></div>
 		</div>
 	</div>
-	<div class="articoloContainer">
+	<div class="articoloContainer" >
 		<div class="headArticolo">
-			<div class="articoloMainMedia mediaContent">
+			<div class="articoloMainMedia mediaContent" <?php echo $mediaMetaInfo;?>>
 			<?php 	if(!is_null($media)) {
 						$media->renderMedia(array("size"=>MediaRenderer::SIZE_BIG));
 					}
 			?>
 			</div>
 			<div class="articoloTitle">
-				<div class="title"><?php echo $articolo->titolo;?></div>
+				<div class="title" itemprop="name"><?php echo $articolo->titolo;?></div>
 				<div class="subTitle">
 					<span><?php echo $data;?> &mdash;</span>  
-					<span><?php echo $articolo->sottotitolo;?></span>
+					<span itemprop="headline"><?php echo $articolo->sottotitolo;?></span>
 				</div>
 			</div>
 		</div>
@@ -74,7 +81,7 @@ try {
 					<a class="socialLink" href="www.plus.google.com/"><div style="background-image:url(images/google_round.png);"></div></a>
 				</div>			
 			</div>
-			<div class="articoloTesto"><?php echo $articolo->testo;?></div>
+			<div class="articoloTesto" itemprop="articleBody"><?php echo $articolo->testo;?></div>
 			<?php if(sizeof($medias)>1){?>
 					<div class="mediasConatiner">
 						<div class="headMedias">
diff --git a/public/js/functions.js b/public/js/functions.js
index 665e1bf..bbd8319 100644
--- a/public/js/functions.js
+++ b/public/js/functions.js
@@ -11,19 +11,3 @@ function bannerClick(banner, link){
 	$.ajax({url: "stats/bannerClick.php", method: "POST", data: { "banner": banner, "source": window.location.href }, dataType: "html" });
 	window.open(link);
 }
-
-function shareOnFacebook(id){
-	
-//	var link="http://www.ifattidinapoli.it/Giornale/all/"+sezione+".php?id="+id;
-	var link="http://www.ifattidinapoli.it/Giornale/all/fbMetadata.php?id="+id;
-	var url="http://www.facebook.com/sharer.php?u="+encodeURIComponent(link);
-	window.open(url);
-}
-
-
-//http://twitter.com/home?source=ichc&status=%22Lucky+Fail%22 - http%3A%2F%2Ftwlol.com%2Ftw%2F%3Fv7-35104 %23lol+%23fail
-function twitterPost(sezione,id,titolo){
-	var link=titolo+" - http://www.ifattidinapoli.it/Giornale/all/"+sezione+".php?id="+id;
-	var url="http://twitter.com/home?source=ifdn&status="+encodeURIComponent(link);
-	window.open(url);
-}
\ No newline at end of file