Updated markup and color scheme