Swap out some tags.
fix some color and positioning stuffs.