Color and alignment tweaks