diff --git a/data/theme/gtk-styles.css b/data/theme/gtk-styles.css
index eb77f3fb..8e996542 100644
--- a/data/theme/gtk-styles.css
+++ b/data/theme/gtk-styles.css
@@ -47,7 +47,6 @@ GtkClutterOffscreen.contents .frame {
   font: 10;
 }
 
-
 .calendar-view:selected {
   color: #0C73E5;
   background-color: shade (#fff, 0.5);
@@ -72,11 +71,11 @@ GtkClutterOffscreen.contents .frame {
   border-radius: 0;
 }
 
-.scrollbar.slider {
+.calendar-view .scrollbar.slider {
   background-color: alpha (@scrollbar_slider, 0.5);
   border: #6e6e6e 1px solid;
 }
-.scrollbar.trough {
+.calendar-view .scrollbar.trough {
   background-color: transparent;
   background-image: none;
 }
diff --git a/src/gcal-time-entry.h b/src/gcal-time-entry.h
index b1967977..afc20c09 100644
--- a/src/gcal-time-entry.h
+++ b/src/gcal-time-entry.h
@@ -31,8 +31,6 @@ G_BEGIN_DECLS
 #define GCAL_IS_TIME_ENTRY_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE((klass), GCAL_TYPE_TIME_ENTRY))
 #define GCAL_TIME_ENTRY_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS((obj), GCAL_TYPE_TIME_ENTRY, GcalTimeEntryClass))
 
-typedef struct _GcalTime GcalTime;
-
 typedef struct _GcalTimeEntry                GcalTimeEntry;
 typedef struct _GcalTimeEntryClass           GcalTimeEntryClass;
 typedef struct _GcalTimeEntryPrivate         GcalTimeEntryPrivate;
diff --git a/src/gcal-window.c b/src/gcal-window.c
index e1adfe6f..bbe1c484 100644
--- a/src/gcal-window.c
+++ b/src/gcal-window.c
@@ -280,9 +280,7 @@ gcal_window_constructed (GObject *object)
   holder = gtk_grid_new ();
   button = gtk_button_new_with_label (_("Done"));
   gtk_widget_set_size_request (button, 100, -1);
-  gtk_container_set_border_width (GTK_CONTAINER (button), 3);
   gtk_widget_set_hexpand (button, FALSE);
-  gtk_widget_set_vexpand (button, TRUE);
   gtk_widget_set_halign (button, GTK_ALIGN_START);
   gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
   gtk_style_context_add_class (