Make labels better