fix layout and date

Change-Id: I37e833ec3fefaeb74187a7f9f8815ff150dfeef7