Fixed coloring and adjusted some of the layout
Merge remote-tracking branch 'origin/master'