diff --git a/app/templates/orbit_bootstrap/modules/calendar/index.html.erb b/app/templates/orbit_bootstrap/modules/calendar/index.html.erb
index abdd5cf..f573205 100644
--- a/app/templates/orbit_bootstrap/modules/calendar/index.html.erb
+++ b/app/templates/orbit_bootstrap/modules/calendar/index.html.erb
@@ -1,15 +1,15 @@
 <div id="orbit_calendar">
-  <div id='sec1' class="cal-fn">
+  <div id="sec1">
     <div class="btn-toolbar" id="navigation">
       <div id="calendar-nav">
-        <button class="btn" id="today_btn">Today</button>
         <div class="btn-group">
-          <button class="btn" id="prev_month_btn">
+          <button class="btn btn-default btn-sm" id="prev_month_btn">
             <i class="icon-chevron-left"></i>
           </button>
-          <button class="btn" id="next_month_btn">
+          <button class="btn btn-default btn-sm" id="next_month_btn">
             <i class="icon-chevron-right"></i>
           </button>
+          <button class="btn btn-default btn-sm" id="today_btn">Today</button>
         </div>
       </div>
     </div>
@@ -17,12 +17,12 @@
   </div>
   <div id='sec3' class="btn-toolbar">
     <div class="btn-group calendar_mode">
-      <button class="btn mode_switch" data-mode="agendaDay" >day</button>
-      <button class="btn mode_switch" data-mode="agendaWeek" >week</button>
-      <button class="btn active mode_switch" data-mode="month" >month</button>
-      <button class="btn mode_switch" data-mode="agenda" >agenda</button>
+      <button class="btn btn-default mode_switch btn-sm" data-mode="agendaDay" >day</button>
+      <button class="btn btn-default mode_switch btn-sm" data-mode="agendaWeek" >week</button>
+      <button class="btn btn-default active mode_switch btn-sm" data-mode="month" >month</button>
+      <button class="btn btn-default mode_switch btn-sm" data-mode="agenda" >agenda</button>
     </div>
-    <button id="refresh_btn" class="btn">
+    <button id="refresh_btn" class="btn btn-default btn-sm">
       <i class="icons-cycle"></i>
     </button>
   </div>
@@ -33,7 +33,7 @@
   </div>
 </div>
 <div id="event_quick_view" class="modal" style="width: 300px; display:none; margin:0 0 0 0;"></div>
-<div id="calendar-loading">Loading...</div>
+<div id="calendar-loading"></div>
 
 <script type="text/javascript">
   var calendar = new Calendar("#calendar","{{page_id}}");
diff --git a/built_in_extensions.rb b/built_in_extensions.rb
index 1c55da1..10d91b5 100644
--- a/built_in_extensions.rb
+++ b/built_in_extensions.rb
@@ -1,8 +1,8 @@
 gem 'announcement', git: 'http://gitlab.tp.rulingcom.com/saurabh/announcement-test.git'
-gem 'ad_banner', path: '/home/rulingcom/designer/modules/ad_banner_pro'
+gem 'ad_banner', git: 'http://gitlab.tp.rulingcom.com/saurabh/adbanner-test.git'
 gem "archive", git: 'http://gitlab.tp.rulingcom.com/saurabh/archive.git'
 gem 'gallery', git: 'http://gitlab.tp.rulingcom.com/saurabh/gallery.git'
-gem 'links', git: 'http://gitlab.tp.rulingcom.com/saurabh/links.git'
+gem 'web_resource', git: 'http://gitlab.tp.rulingcom.com/saurabh/links.git'
 gem 'page_content', git: 'http://gitlab.tp.rulingcom.com/saurabh/pagecontent.git'
 gem 'faq', git: 'http://gitlab.tp.rulingcom.com/saurabh/faq.git'
 gem 'calendar', git: 'http://gitlab.tp.rulingcom.com/harry/calendar.git'
diff --git a/config/mongoid.yml b/config/mongoid.yml
index db95631..d0cb610 100644
--- a/config/mongoid.yml
+++ b/config/mongoid.yml
@@ -1,14 +1,14 @@
 development:
   sessions:
     default:
-      database: orbit_4_5_joshua
+      database: orbit_4_5
       hosts:
         - localhost:27017
 
 test:
   sessions:
     default:
-      database: orbit_4_5_joshua
+      database: orbit_4_5
       hosts:
         - localhost:27017
       options:
@@ -21,6 +21,6 @@ production:
     default:
       # username:
       # password:
-      database: orbit_4_5_joshua
+      database: orbit_4_5
       hosts:
         - localhost:27017