Updated layout and colors