diff --git a/modules/announcement/_annc_widget17.html.erb b/modules/announcement/_annc_widget17.html.erb
index f6ab3de..01c1a98 100644
--- a/modules/announcement/_annc_widget17.html.erb
+++ b/modules/announcement/_annc_widget17.html.erb
@@ -128,7 +128,7 @@
 			num=1;
 		}
 	var flag=false;
-	$('.btn-left').click(function(){
+	$('[data-subpart-id=\"{{subpart-id}}\"] .btn-left').click(function(){
 		if(!flag){
 			var uls = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list:not(.hidden_item)').toArray();
 			var ul_length = uls.length;
@@ -147,7 +147,7 @@
 			$('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list.active').eq(0).effect("slide", { direction: "left", mode: 'show', duration: 500},function(){$("body").css("overflow-x","");flag=false;});
 		};
 	});
-	$('.btn-right').click(function(){
+	$('[data-subpart-id=\"{{subpart-id}}\"] .btn-right').click(function(){
 		var lilength = $('[data-subpart-id=\"{{subpart-id}}\"] li.w-annc__item').length;
 		if(!flag){
 			var uls = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list:not(.hidden_item)').toArray();
diff --git a/modules/text_marquee/_widget.html.erb b/modules/text_marquee/_widget.html.erb
index de5d359..f4ca0fd 100644
--- a/modules/text_marquee/_widget.html.erb
+++ b/modules/text_marquee/_widget.html.erb
@@ -1,37 +1,31 @@
 <div class="marquee-1" module="text_marquee" data-ps="">
 	<ul class="marquee" data-level="0" data-list="texts">
-		<li><a href="{{url}}" target="_blank" speed='{{speed}}'>{{text}}</a></li>
+		<li>{{content}}</li>
 	</ul>
 </div>
- 
+
 <script type="text/javascript">
 	(function(){
 		var main_div = $("div[data-subpart-id={{subpart-id}}]"),
 			total_texts = main_div.find("ul li").length - 1,
 			current_text = 0,
-			last_text = 0;
-
+			last_text = 0,
+			speed = 3000;
 		main_div.find("ul li").hide();
-		var textTransform = function(){
-			current_text++;
+		function textTransform(){
 			current_text = (current_text > total_texts ? 0 : current_text);
 			last_text = (current_text == 0 ? total_texts : current_text - 1);
-			speed = $('.marquee > li > a').eq(current_text).attr('speed');
-			main_div.find("ul li").eq(last_text).slideUp(500);
-			main_div.find("ul li").eq(current_text).slideDown(500);
+			speed = main_div.find("ul li").eq(current_text).find("> a").eq(0).attr('speed');
+			main_div.find("ul li").eq(last_text).stop(true, true).slideUp({duration: 500, queue: true});
+			main_div.find("ul li").eq(current_text).stop(true, true).slideDown({duration: 500, queue: true});
+			current_text++;
 			if(total_texts > 0){
-				setTimeout(textTransform,speed);
+				if(window["{{subpart-id}}_time_out_id"])
+					clearTimeout(window["{{subpart-id}}_time_out_id"]);
+				window["{{subpart-id}}_time_out_id"] = setTimeout(textTransform,speed);
 			}
+			return;
 		}
-		setTimeout(textTransform,500);
+		textTransform();
 	})();
 </script>
-	
-<script type="text/javascript">
-	(function(){
-		var main_div = $("div[data-subpart-id"{{subpart-id}})
-	}	
-</script>
-	
-
-