More work on date page