Updated colors and layout