218-219 labels + modal fix
Merge pull request #1 from CreativeComments/218-219-labels

218-219 labels + modal fix