Reorganize timebar again