Continued work on the labels tab