Tweak colors and some styling
Clean up.