re-order chronologically
Style tweaks