#604

This moves the expiry date to the same line. Maybe a better solution
could be made. It certainly looks better for the expiry to be beneath
the publish date.