Add'l changes to color and layout