Fix color/spacing