added colors and still working on edit