Formatting and color tweaks