diff --git a/src/components/PropField.js b/src/components/PropField.js
index d89603f2594..efe0ab8e3cb 100644
--- a/src/components/PropField.js
+++ b/src/components/PropField.js
@@ -15,7 +15,7 @@ const stylesheet = {
     paddingRight: 5,
     paddingTop: 7,
     textAlign: 'right',
-    width: 20,
+    width: 60,
     fontSize: 10,
     color: 'rgb(68, 68, 68)',
     textTransform: 'uppercase',
diff --git a/src/components/types/Date.js b/src/components/types/Date/index.js
similarity index 73%
rename from src/components/types/Date.js
rename to src/components/types/Date/index.js
index 89f3b5379b0..98060df0046 100644
--- a/src/components/types/Date.js
+++ b/src/components/types/Date/index.js
@@ -1,9 +1,22 @@
 import React from 'react';
 import Datetime from 'react-datetime';
 import insertCss from 'insert-css';
-import style from './Date-style';
+import style from './styles';
+
+const customStyle = `
+  .rdt input {
+    outline: 0;
+    width: 300px;
+    border: 1px solid #f7f4f4;
+    borderRadius: 2px;
+    fontSize: 11px;
+    padding: 5px;
+    color: #555;
+  }
+`;
 
 insertCss(style);
+insertCss(customStyle);
 
 class DateType extends React.Component {
   render() {
diff --git a/src/components/types/Date-style.js b/src/components/types/Date/styles.js
similarity index 97%
rename from src/components/types/Date-style.js
rename to src/components/types/Date/styles.js
index b107ad1a342..db6b7bb5877 100644
--- a/src/components/types/Date-style.js
+++ b/src/components/types/Date/styles.js
@@ -1,4 +1,4 @@
-const style = `
+export default `
   .rdt {
     position: relative;
   }
@@ -20,12 +20,12 @@ const style = `
     box-shadow: none;
     position: static;
   }
-  
+
   .rdtPicker .rdtTimeToggle {
     text-align: center;
     font-size:11px;
   }
-  
+
   .rdtPicker table {
     width: 100%;
     margin: 0;
@@ -78,7 +78,7 @@ const style = `
     color: #999999;
     cursor: not-allowed;
   }
-  
+
   .rdtPicker td span.rdtOld {
     color: #999999;
   }
@@ -105,7 +105,7 @@ const style = `
     font-size: 11px;
     vertical-align: top;
   }
-  
+
   .rdtPrev span,
   .rdtNext span {
     display: block;
@@ -116,7 +116,7 @@ const style = `
     -ms-user-select: none;       /* Internet Explorer/Edge */
     user-select: none;
   }
-  
+
   .rdtPicker th.rdtDisabled,
   .rdtPicker th.rdtDisabled:hover {
     background: none;
@@ -129,11 +129,11 @@ const style = `
   .rdtPicker thead tr:first-child th:hover {
     background: #eeeeee;
   }
-  
+
   .rdtPicker tfoot {
     border-top: 1px solid #f9f9f9;
   }
-  
+
   .rdtPicker button {
     border: none;
     background: none;
@@ -142,12 +142,12 @@ const style = `
   .rdtPicker button:hover {
     background-color: #eee;
   }
-  
+
   .rdtPicker thead button {
     width: 100%;
     height: 100%;
   }
-  
+
   td.rdtMonth,
   td.rdtYear {
     height: 50px;
@@ -158,38 +158,38 @@ const style = `
   td.rdtYear:hover {
     background: #eee;
   }
-  
+
   td.rdtDay {
     font-size: 11px
   }
-  
+
   .rdtCounters {
     display: inline-block;
   }
-  
+
   .rdtCounters > div {
     float: left;
   }
-  
+
   .rdtCounter {
     height: 100px;
   }
-  
+
   .rdtCounter {
     width: 40px;
   }
-  
+
   .rdtCounterSeparator {
     line-height: 100px;
   }
-  
+
   .rdtCounter .rdtBtn {
     height: 40%;
     line-height: 40px;
     cursor: pointer;
     display: block;
     font-size: 11px;
-  
+
     -webkit-touch-callout: none; /* iOS Safari */
     -webkit-user-select: none;   /* Chrome/Safari/Opera */
     -khtml-user-select: none;    /* Konqueror */
@@ -204,18 +204,16 @@ const style = `
     height: 20%;
     font-size: 11px;
   }
-  
+
   .rdtMilli {
     vertical-align: middle;
     padding-left: 8px;
     width: 48px;
   }
-  
+
   .rdtMilli input {
     width: 100%;
     font-size: 11px;
     margin-top: 37px;
   }
 `;
-
-export default style;