added date picker and bootstrap compliant