diff --git a/app/assets/stylesheets/simple_calendar.scss b/app/assets/stylesheets/simple_calendar.scss
index 61e8ec69..85b1d90b 100644
--- a/app/assets/stylesheets/simple_calendar.scss
+++ b/app/assets/stylesheets/simple_calendar.scss
@@ -25,6 +25,10 @@
     text-align: left;
   }
 
+  thead{
+    background: pink;
+  }
+
   td {
     padding: 6px;
     vertical-align: top;
@@ -76,3 +80,9 @@
 
   .has-events {}
 }
+
+.select-month{
+  width: 15%;
+  margin-top: -30px;
+  margin-left: 880px;
+}
diff --git a/app/views/simple_calendar/_month_calendar.html.erb b/app/views/simple_calendar/_month_calendar.html.erb
index b30355e5..5fd539e9 100644
--- a/app/views/simple_calendar/_month_calendar.html.erb
+++ b/app/views/simple_calendar/_month_calendar.html.erb
@@ -1,5 +1,16 @@
 <div class="simple-calendar">
   <div class="calendar-heading">
+    <ul class="nav select-month" role="navigation">
+      <li class="Months">
+        <%= link_to 'Select Month <b class="caret"></b>'.html_safe, root_path, :'data-toggle' => 'dropdown', :class => 'dropdown-toggle' %>
+        <ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
+          <% n = t('date.month_names').count-1 %>
+          <% (1..n).each do |i| %>
+            <li class="dropdown-link"><%= link_to t('date.month_names')[i], calendar.custom_month(t('date.month_names')[i]) %></li> 
+          <% end%>
+        </ul>
+      </li>
+    </ul>    
     <%= link_to t('simple_calendar.previous', default: 'Previous'), calendar.url_for_previous_view %>
     <span class="calendar-title"><%= t('date.month_names')[start_date.month] %> <%= start_date.year %></span>
     <%= link_to t('simple_calendar.next', default: 'Next'), calendar.url_for_next_view %>
@@ -20,9 +31,9 @@
           <% week.each do |day| %>
             <%= content_tag :td, class: calendar.td_classes_for(day) do %>
               <% if defined?(Haml) && respond_to?(:block_is_haml?) && block_is_haml?(block) %>
-                <% capture_haml(day, sorted_events.fetch(day, []), &block) %>
+                <% capture_haml(day.day, sorted_events.fetch(day, []), &block) %>
               <% else %>
-                <% block.call day, sorted_events.fetch(day, []) %>
+                <% block.call day.day, sorted_events.fetch(day, []) %>
               <% end %>
             <% end %>
           <% end %>
diff --git a/lib/simple_calendar/calendar.rb b/lib/simple_calendar/calendar.rb
index 50043b07..45bcfb1d 100644
--- a/lib/simple_calendar/calendar.rb
+++ b/lib/simple_calendar/calendar.rb
@@ -40,11 +40,24 @@ def td_classes_for(day)
       td_class << 'prev-month'    if start_date.month != day.month && day < start_date
       td_class << 'next-month'    if start_date.month != day.month && day > start_date
       td_class << 'current-month' if start_date.month == day.month
-      td_class << 'has-events'    if sorted_events.fetch(day, []).any?
-
+      if sorted_events.fetch(day, []).any?
+        td_class << 'has-events'    
+        if sorted_events.fetch(day, []).first.type == "federal"
+          td_class << 'federal'  
+        elsif sorted_events.fetch(day, []).first.type == "holiday"
+          td_class << 'holiday'
+        else
+          td_class << 'system'
+        end  
+      end
       td_class
     end
 
+    def custom_month(month)
+      custom_date = month.to_date
+      view_context.url_for(@params.merge(start_date_param => custom_date))
+    end
+
     def url_for_next_view
       view_context.url_for(@params.merge(start_date_param => date_range.last + 1.day))
     end