refactoring
change colors
fix bug