changed colors and fixed margins