added colors and layout