Merge "Solving bug where labels were uneven"