Updated colors/ layouts