Refactored styles based on first designer review with Brice.
Merge