Added date picker and start working on style