diff --git a/built_in_extensions.rb b/built_in_extensions.rb
index ad45986..c91f1e7 100644
--- a/built_in_extensions.rb
+++ b/built_in_extensions.rb
@@ -1,2 +1,2 @@
-gem 'announcement', git: '/Users/saurabhbhatia/announcement-test'
+gem 'announcement', git: 'git@gitlab.tp.rulingcom.com:saurabh/announcement-test.git'
 gem 'ad_banner', git: 'git@gitlab.tp.rulingcom.com:saurabh/adbanner-test.git' 
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ae8f367..154c41e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -42,6 +42,8 @@ en:
   desktop: Desktop
   homepage: Homepage
   password: Password
+  all: All
+  add: Add
 
   site:
     system_preference: System Preference
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 0056a6e..0984455 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -20,6 +20,8 @@ zh_tw:
   dashboard_: 儀表版
   desktop: 桌面
   password: 密碼
+  all: 全部
+  add: 新增
 
   site: 
     system_preference: 系統狀態
diff --git a/lib/orbit_app/helper/context_link_renderer.rb b/lib/orbit_app/helper/context_link_renderer.rb
index 6755299..ea57efb 100644
--- a/lib/orbit_app/helper/context_link_renderer.rb
+++ b/lib/orbit_app/helper/context_link_renderer.rb
@@ -6,7 +6,6 @@ module ContextLinkRenderer
     @belong_module_app = belong_module_app
     @request = request
     @params = params
-    content_tag :li, link_to(content_tag(:span, I18n.t(@label_i18n)), eval(@path)), :class => (active?  ? 'active' : nil) 
+    content_tag :li, link_to(content_tag(:span, I18n.t(@label_i18n)), Rails.application.routes.url_helpers.send(@path)), :class => (active?  ? 'active' : nil) 
   end
-
 end
\ No newline at end of file