diff --git a/.gitignore b/.gitignore
index 560a9a39..20a0d7fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,6 @@ node_modules
 npm-debug.log
 .vscode
 .coveralls.yml
-dist/build.js
-dist/build.js.map
 test/unit/coverage
 yarn-debug.log*
 yarn-error.log*
diff --git a/src/components/Datepicker.vue b/src/components/Datepicker.vue
index 929d5ff8..afb4fc4c 100644
--- a/src/components/Datepicker.vue
+++ b/src/components/Datepicker.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="vdp-datepicker" :class="[wrapperClass, isRtl ? 'rtl' : '']">
-    <div :class="{'input-group' : bootstrapStyling}">
+    <div :class="{'form-group' : bootstrapStyling}">
       <!-- Calendar Button -->
       <span v-if="calendarButton" class="vdp-datepicker__calendar-button" :class="{'input-group-addon' : bootstrapStyling}" @click="showCalendar" v-bind:style="{'cursor:not-allowed;' : disabledPicker}">
         <i :class="calendarButtonIcon">
@@ -9,6 +9,8 @@
         </i>
       </span>
       <!-- Input -->
+      <label>{{ label }}</label>
+      <!-- Input -->
       <input
         :type="inline ? 'hidden' : 'text'"
         :class="[ inputClass, { 'form-control' : bootstrapStyling } ]"
@@ -151,6 +153,7 @@ export default {
     initialView: String,
     disabledPicker: Boolean,
     required: Boolean,
+    label: String,
     minimumView: {
       type: String,
       default: 'day'