fixup layout and add date display