diff --git a/templates/org/course_list.tmpl b/templates/org/course_list.tmpl
index dc07e0b21..4c6392276 100644
--- a/templates/org/course_list.tmpl
+++ b/templates/org/course_list.tmpl
@@ -67,7 +67,11 @@
         background-color: #B3DBDB !important;
         font-weight:normal !important
     }
-
+    .tag_text{
+        /* margin-top: 2px; */
+        /* margin-left: 0.5em; */
+        font-size: 14px;
+    }
 
 </style>
 <!-- <div class="ui stackable grid"> -->
@@ -120,29 +124,14 @@
                                                         
                         
                     </div>
-                    <div class=" extra " style="color:#888888;border-top: none !important;padding-top: 0px;">
-                        <p class="time" style="font-size: 14px;">
-                            
-                            <img class="ui avatar" style="width: 22px;height:22px;" src="{{.Creator.RelAvatarLink}}">
-
-                             {{$.i18n.Tr "org.repo_updated"}}&nbsp;: &nbsp;{{.CreatedUnix.FormatShort}} 
-                            
-                            <!-- {{if .PrimaryLanguage }}
-                            <span class="text grey"><i class="color-icon" style="background-color: {{.PrimaryLanguage.Color}}"></i>{{ .PrimaryLanguage.Language }}</span>
-                            {{end}} -->
-                        </p>
-                        <!-- <div class="ui mini right compact marg" >
-                            <a class="item marg ">
-                                {{svg "octicon-eye" 16}} {{.NumWatches}}
-                            </a>
-                            <a class="item marg">
-                                {{svg "octicon-star" 16}} {{.NumStars}}
-                            </a>
-                            <a class="item marg">
-                                {{svg "octicon-git-branch" 16}} {{.NumForks}}
-                            </a>
-                            
-                        </div> -->
+                    <div class=" extra content" style="color:#888888;border-top: none !important;padding-top: 0px;">                            
+                        <!-- <img class="ui avatar" style="width: 22px;height:22px;display:flex;vertical-align: middle;" src="{{.Creator.RelAvatarLink}}"> -->
+                        <div class="left aligned author">
+                        <!-- <span > -->
+                            <img class="ui avatar image" style="width: 22px;height:22px;" src="{{.Creator.RelAvatarLink}}"> 
+                             {{$.i18n.Tr "org.repo_updated"}}&nbsp;: &nbsp; {{TimeSinceUnixShort .UpdatedUnix}}
+                        <!-- </span> -->
+                        </div>
                     </div>
                 </div>   
             {{end}}
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index 8f6230e4b..771e8e7f9 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -65,7 +65,7 @@
 	}
 	.tag_key{
 		max-width:100%;
-		margin: 2px 2px;
+		margin: 3px 3px;
 		display:inline-flex;
 	}
    .bpadding{
@@ -158,11 +158,12 @@
 			<div class="ui sixteen wide computer column">
 				<div class="ui mobile reversed stackable grid">
 					<div class="ui ten wide tablet eleven wide computer column" id='tag'>
-						<a class="tag_key " ><span class="ui small tag_lable topic omit tag_bg"  >全部关键字</span></a>
+	
+						<a class="{{if eq $.Keyword "" }} tag_bg {{end}} tag_key ui small tag_lable topic omit"  href="{{$.Link}}?"  >全部关键字</span></a>
                         {{range .CoursesKeywords}}
                             <!-- <a class="ui small lable tag_lable topic" >{{.}}</a> -->
-							<a  class="tag_key"  >
-								<span class="ui small tag_lable topic omit"  >{{.}}</span>
+							<a  class="{{if eq $.Keyword . }} tag_bg {{end}} tag_key ui small tag_lable topic omit" href="{{$.Link}}?q={{.}}" >
+								 {{.}}
 							</a>
                         {{end}}
 					</div>
@@ -217,7 +218,7 @@
                                         <div class="item">
                                             <i class="ri-bookmark-3-line course_color" ></i>
                                             <div class="content"  style="margin-left: 10px;">
-                                                <a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Alias}}</strong></a>
+                                                <a href="{{.Link}}"><strong class="team-name">{{.Alias}}</strong></a>
                                                 <p class="text grey">
                                                     贡献者：{{.Creator.Name}}
                                                 </p>
@@ -325,21 +326,22 @@
 	// 	// this.classList.add("tag_bg")
 	// }
 
-	window.onload = function ()
-	{
-		var atag =document.getElementById("tag").getElementsByTagName("a");
-
-		var i = 0;
-		for (i = 0; i < atag.length; i++)
-			{
-				atag[i].onclick = function ()
-				{
-					for (i = 0; i < atag.length; i++)
-						atag[i].getElementsByTagName('span')[0].className = "ui small tag_lable topic omit";
-						this.getElementsByTagName('span')[0].className = "ui small tag_lable topic omit tag_bg";
-				};
-		}
-	};
+	// window.onload = function (){
+	// // function changeBgcolor (obj){
+	// 	// document.getElementsByTagName("search_selectPro").value=''
+	// 	// obj.getElementsByTagName('span').className = "ui small tag_lable topic omit tag_bg";
+	// 	var atag =document.getElementById("tag").getElementsByTagName("a");
+
+	// 	var i = 0;
+	// 	for (i = 0; i < atag.length; i++){
+	// 			atag[i].onclick = function ()
+	// 			{
+	// 				for (i = 0; i < atag.length; i++)
+	// 					atag[i].getElementsByTagName('span')[0].className = "ui small tag_lable topic omit";
+	// 					this.getElementsByTagName('span')[0].className = "ui small tag_lable topic omit tag_bg";
+	// 			};
+	// 	}
+	// };
 
     var data;
     var filterData=[];
diff --git a/templates/org/team/courseTeams.tmpl b/templates/org/team/courseTeams.tmpl
index e69de29bb..e7081b58f 100644
--- a/templates/org/team/courseTeams.tmpl
+++ b/templates/org/team/courseTeams.tmpl
@@ -0,0 +1,48 @@
+{{template "base/head" .}}
+<div class="organization teams">
+	{{template "org/header" .}}
+	<div class="ui container">
+		{{template "base/alert" .}}
+		{{template "org/navber" .}}
+		<div class="ui stackable grid">
+		
+		
+			
+			<div class="ui sixteen wide computer column list">
+				<div class="ui two column grid">
+			{{range .Teams}}
+					<div class="column">
+						<div class="ui top attached header">
+							<a class="text black" href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong>{{.Name}}</strong></a>
+							<div class="ui right">
+								{{if .IsMember $.SignedUser.ID}}
+									<form method="post" action="{{$.OrgLink}}/teams/{{.LowerName}}/action/leave">
+										{{$.CsrfTokenHtml}}
+										<button type="submit" class="ui red small button" name="uid" value="{{$.SignedUser.ID}}">{{$.i18n.Tr "org.teams.leave"}}</button>
+									</form>
+								{{else if $.IsOrganizationOwner}}
+									<form method="post" action="{{$.OrgLink}}/teams/{{.LowerName}}/action/join">
+										{{$.CsrfTokenHtml}}
+										<button type="submit" class="ui blue small button" name="uid" value="{{$.SignedUser.ID}}">{{$.i18n.Tr "org.teams.join"}}</button>
+									</form>
+								{{end}}
+							</div>
+						</div>
+						<div class="ui attached segment members">
+							{{range .Members}}
+								<a href="{{.HomeLink}}" title="{{.Name}}">
+									<img class="ui avatar image" src="{{.RelAvatarLink}}">
+								</a>
+							{{end}}
+						</div>
+						<div class="ui bottom attached header">
+							<p class="team-meta">{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}</p>
+						</div>
+					</div>
+			{{end}}
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+{{template "base/footer" .}}