Updated labels. Still need to fix sorting