updated colors and layout