Implement Date strategy and fix radio btn style