Fix merge conflicts and add time table cell width