Minor updates around colors, spacing, and such