diff --git a/lib/parser.rb b/lib/parser.rb
index 41f8e296b..51580e48b 100644
--- a/lib/parser.rb
+++ b/lib/parser.rb
@@ -80,6 +80,13 @@ module Parser
         ret << tag.expand
         ret << '</div>'
       end
+      c.define_tag 'link' do |tag|
+        item = Item.first(:conditions => { :full_name => tag.attr['name'] })
+        ret = ''
+        ret << "<a href='#{tag.attr['name']}'>"
+        ret << item.i18n_variable[I18n.locale]
+        ret << '</a>'
+      end
     end
   end
   
@@ -165,6 +172,15 @@ module Parser
         ret << tag.expand
         ret << '</div>'
       end
+      c.define_tag 'link' do |tag|
+        item = Item.first(:conditions => { :full_name => tag.attr['name'] })
+        ret = ''
+        ret << "<a href='"
+        ret << eval("admin_#{item._type.downcase}_path(item.id)")
+        ret << "' class='nav'>"
+        ret << item.i18n_variable[I18n.locale]
+        ret << "</a>"
+      end
     end
   end
   
diff --git a/lib/template/nav.snippet b/lib/template/nav.snippet
index c47d664b5..14766176e 100644
--- a/lib/template/nav.snippet
+++ b/lib/template/nav.snippet
@@ -1,27 +1,5 @@
 <ul>
-  <li>
-		<a href='/'>
-			<r:multi_lang>
-				<r:lang name='en'>
-					Home
-				</r:lang>
-				<r:lang name='zh_tw'>
-					首頁
-				</r:lang>
-			</r:multi_lang>
-		</a>
-	</li>
-  <li>
-		<a href='/about'>
-			<r:multi_lang>
-				<r:lang name='en'>
-					About
-				</r:lang>
-				<r:lang name='zh_tw'>
-					關於我們
-				</r:lang>
-			</r:multi_lang>
-		</a>
-	</li>
-  <li><a href='/google'>Google</a></li>
+  <li><r:link name='home' /></li>
+	<li><r:link name='about' /></li>
+  <li><r:link name='google' /></li>
 </ul>