changed colors and layout a bit