added labels, fixed color pick, added classes