improved layout, inserts date