Added
Fixed coloring and adjusted some of the layout