fixed colors, and working on layout