diff --git a/private/lib/gui/html.inclusion.php b/private/lib/gui/html.inclusion.php
index 4de0787..00d4aff 100644
--- a/private/lib/gui/html.inclusion.php
+++ b/private/lib/gui/html.inclusion.php
@@ -61,6 +61,10 @@ GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_USER,"photoswipe-ui-default.
 GUIHandlerMobile::addJavascriptLib(GUIHandlerMobile::JAVASCRIPT_USER,"photoswipe.min.js");
 
 GUIHandlerMobile::addJavascriptLib(GUIHandlerMobile::JAVASCRIPT_USER,"photoswipe-ui-default.min.js");
+
+GUIHandler::addJavascriptLib(GUIHandler::JAVASCRIPT_GENERAL,"calls.js");
+
+GUIHandlerMobile::addJavascriptLib(GUIHandlerMobile::JAVASCRIPT_USER,"calls.js");
 /*
  ____  _   _ ____  _     ___ ____ 
 |  _ \| | | | __ )| |   |_ _/ ___|
diff --git a/private/lib/media/mediaRenderers/MediaLocalVideo.php b/private/lib/media/mediaRenderers/MediaLocalVideo.php
index 2b6326e..2bfe1aa 100644
--- a/private/lib/media/mediaRenderers/MediaLocalVideo.php
+++ b/private/lib/media/mediaRenderers/MediaLocalVideo.php
@@ -8,14 +8,17 @@ class MediaLocalVideo extends MediaRenderer{
 	}
 
 	public function asText(array $opt = array()){
-		$size = MediaRendererInterface::SIZE_ORIGINAL;
-		if(array_key_exists("size", $opt) && array_key_exists($opt["size"], self::$SIZES)){
+		$size = self::$SIZES[self::SIZE_BIG];
+		if(array_key_exists("size", $opt) && array_key_exists($opt["size"], self::$SIZES) && $opt["size"] != self::SIZE_ORIGINAL){
 			$size = self::$SIZES[$opt["size"]];
 		}
 		
-		return '<div style="display:inline-block;" class="videoContainerForImageAppend"><video width="'.$size["width"].'" height="'.$size["height"].'" poster="data:image/gif,AAAA" preload="auto" controls >'.
-					'<source src="'.$this->getVideoLink($size).'"   type=\'video/'.$this->getExtension().'; codecs="avc1.4D401E, mp4a.40.2"\'>'.
-				'</video></div>';
+		$loaderSize = self::$SIZES[self::SIZE_BIG];
+
+		return '<div style="position:relative;" class="videoContainerForImageAppend"><img class="poster" src="'.GUIHandler::getBaseUrl().'/images/loading.gif" style="width:'.$loaderSize["width"].'px;height:'.$loaderSize["height"].'px;background-color:black;position:absolute;top:0;left:0;" />'.
+					'<video width="'.$size["width"].'" preload="auto" controls style="visibility:hidden;">'.
+						'<source src="'.$this->getVideoLink($size).'"   type=\'video/'.$this->getExtension().'; codecs="avc1.4D401E, mp4a.40.2"\'>'.
+					'</video></div>';
 		
 	}
 	
diff --git a/public/images/loading.gif b/public/images/loading.gif
new file mode 100644
index 0000000..6c2a4ff
Binary files /dev/null and b/public/images/loading.gif differ
diff --git a/public/js/calls.js b/public/js/calls.js
new file mode 100644
index 0000000..3acb568
--- /dev/null
+++ b/public/js/calls.js
@@ -0,0 +1,15 @@
+$(document).ready(function(event){
+	
+	
+	$("video").on('loadstart',function (event){
+		$(".poster").show();
+	});
+
+	$("video").on('canplay',function (event){
+		$(this).parent().find(".poster").hide();
+		$(this).css({"visibility":"visible"});
+	});
+
+	
+	
+});
\ No newline at end of file
diff --git a/public/js/init.js b/public/js/init.js
index 5552be9..9c19180 100644
--- a/public/js/init.js
+++ b/public/js/init.js
@@ -2,18 +2,4 @@ Highcharts.setOptions({
     global : {
         useUTC : false
     }
-});
-
-$(document).ready(function(event){
-	$("video").on('loadstart',function (event){
-		var wid = $(this).innerWidth();
-		$(".videoContainerForImageAppend").append('<img src="images/loading.gif" class="poster" style="width:'+ wid +'px;background-color:black;"/>')
-		$(this).hide();
-	});
-
-	$("video").on('canplay',function (event){
-		$(".poster").hide();
-		$(this).show();
-//			$(this).get(0).play();
-	});
 });
\ No newline at end of file
diff --git a/public/mobile/images/loading.gif b/public/mobile/images/loading.gif
new file mode 100644
index 0000000..6c2a4ff
Binary files /dev/null and b/public/mobile/images/loading.gif differ
diff --git a/public/mobile/js/calls.js b/public/mobile/js/calls.js
new file mode 100644
index 0000000..4d4bbaa
--- /dev/null
+++ b/public/mobile/js/calls.js
@@ -0,0 +1,14 @@
+$(document).ready(function(event){
+	
+	
+	$("video").on('loadstart',function (event){
+		$(".poster").show();
+	});
+
+	$("video").on('canplay',function (event){
+		$(this).parent().find(".poster").hide();
+		$(this).css({"visibility":"visible"});
+	});
+	
+	
+});
\ No newline at end of file
diff --git a/public/mobile/js/init.js b/public/mobile/js/init.js
new file mode 100644
index 0000000..9c19180
--- /dev/null
+++ b/public/mobile/js/init.js
@@ -0,0 +1,5 @@
+Highcharts.setOptions({
+    global : {
+        useUTC : false
+    }
+});
\ No newline at end of file