changed colors and layout