Updated layout/colors and content