Added prettier labels and more functionality