218-219 labels + modal fix