changed colors, fixing grid