adding a little color, and a little more structure
Resolve atdiehm merge conflict and add a mini media query.