Fix colors and alignment
