diff --git a/app/views/messages/index.html.erb b/app/views/messages/index.html.erb
index c5b93ca..219aa7c 100644
--- a/app/views/messages/index.html.erb
+++ b/app/views/messages/index.html.erb
@@ -41,4 +41,15 @@
   </div>
 </div>      
 </body>
-</html>
\ No newline at end of file
+</html>
+
+<script>
+function makeActive(){
+	$('li[id="messages"]').addClass('active');
+};
+
+$(document).ready(function () {
+  makeActive()
+});
+
+</script>
\ No newline at end of file
diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb
index a1d002a..2a83a89 100644
--- a/app/views/messages/new.html.erb
+++ b/app/views/messages/new.html.erb
@@ -81,6 +81,14 @@ $("#submit_button").click(function(event) {
 	});
 });
 
+function makeActive(){
+	$('li[id="messages"]').addClass('active');
+};
+
+$(document).ready(function () {
+  makeActive()
+});
+
 </script>
 
             
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 5bdb6af..9ba9a4f 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -32,140 +32,15 @@
         </div>
     </div>
   </div>
-</div>  
+</div>
+<script type="text/javascript">  
+function makeActive(){
+	$('li[id="messages"]').addClass('active');
+};
 
-      <!--/.fluid-container-->
-    </div>
-    <footer>
-      <p>
-        &copy; BlackForest 2013
-      </p>
-    </footer>
-    <script src="js/jquery.min.js">
-    </script>
-    <script src="js/bootstrap.js">
-    </script>
-    <script type="text/javascript" src="js/date-picker/date.js">
-    </script>
-    <script type="text/javascript" src="js/date-picker/daterangepicker.js">
-    </script>
-    
-    <script type="text/javascript">
-      //ScrollUp
-      $(function () {
-        $.scrollUp({
-          scrollName: 'scrollUp', // Element ID
-          topDistance: '300', // Distance from top before showing element (px)
-          topSpeed: 300, // Speed back to top (ms)
-          animation: 'fade', // Fade, slide, none
-          animationInSpeed: 400, // Animation in speed (ms)
-          animationOutSpeed: 400, // Animation out speed (ms)
-          scrollText: 'Scroll to top', // Text for element
-          activeOverlay: false, // Set CSS color to display scrollUp active point, e.g '#00FFFF'
-        });
-      });
+$(document).ready(function () {
+  makeActive()
+});
 
-      //Tooltip
-      $('a').tooltip('hide');
+</script>
 
-      //Main menu navigation
-      
-      $('.submenu > a').click(function(e){
-        e.preventDefault();
-        var submenu = $(this).siblings('ul');
-        var li = $(this).parents('li');
-        var submenus = $('#mainnav li.submenu ul');
-        var submenus_parents = $('#mainnav li.submenu');
-        if(li.hasClass('open'))
-        {
-          if(($(window).width() > 768) || ($(window).width() < 479)) {
-            submenu.slideUp();
-          } else {
-            submenu.fadeOut(250);
-          }
-          li.removeClass('open');
-        } else 
-        {
-          if(($(window).width() > 768) || ($(window).width() < 479)) {
-            submenus.slideUp();     
-            submenu.slideDown();
-          } else {
-            submenus.fadeOut(250);      
-            submenu.fadeIn(250);
-          }
-          submenus_parents.removeClass('open');   
-          li.addClass('open');  
-        }
-      });
-      
-      var ul = $('#mainnav > ul');
-      
-      $('#mainnav > a').click(function(e)
-      {
-        e.preventDefault();
-        var mainnav = $('#mainnav');
-        if(mainnav.hasClass('open'))
-        {
-          mainnav.removeClass('open');
-          ul.slideUp(250);
-        } else 
-        {
-          mainnav.addClass('open');
-          ul.slideDown(250);
-        }
-      });
-
-
-      //Range Date Picker
-
-      $('.report_range').daterangepicker({
-        ranges: {
-          'Today': ['today', 'today'],
-          'Yesterday': ['yesterday', 'yesterday'],
-          'Last 7 Days': [Date.today().add({
-            days: -6
-          }), 'today'],
-          'Last 30 Days': [Date.today().add({
-            days: -29
-          }), 'today'],
-          'This Month': [Date.today().moveToFirstDayOfMonth(), Date.today().moveToLastDayOfMonth()],
-          'Last Month': [Date.today().moveToFirstDayOfMonth().add({
-            months: -1
-          }), Date.today().moveToFirstDayOfMonth().add({
-            days: -1
-          })]
-        },
-        opens: 'left',
-        format: 'MM/dd/yyyy',
-        separator: ' to ',
-        startDate: Date.today().add({
-          days: -29
-        }),
-        endDate: Date.today(),
-        minDate: '01/01/2012',
-        maxDate: '12/31/2013',
-        locale: {
-          applyLabel: 'Submit',
-          fromLabel: 'From',
-          toLabel: 'To',
-          customRangeLabel: 'Custom Range',
-          daysOfWeek: ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'],
-          monthNames: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'June', 'July', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-          firstDay: 1
-        },
-        showWeekNumbers: true,
-        buttonClasses: ['btn-danger']
-      },
-
-      function (start, end) {
-        $('.report_range span').html(start.toString('MMMM d, yyyy') + ' - ' + end.toString('MMMM d, yyyy'));
-      });
-
-      //Set the initial state of the picker label
-      $('.report_range span').html(Date.today().add({
-        days: -29
-      }).toString('MMMM d, yyyy') + ' - ' + Date.today().toString('MMMM d, yyyy'));
-      </script>
-      
-    </body>
-    </html>
\ No newline at end of file