Fix the label width bug that Cassie found, and add unit test