Updated layout and beginnings of color changes

Up above