Added date-time and improved layouts