Fix period ordering, beginning of period highlighting