Rebase in atdiehm

Resolved merge conflicts for @atdiehm's work and then added a little media query