Fixed up some coloring and alignment stuff