fix some stuff; redo a bunch of js so that color picker is in modal