Continuing to work on date view