Add media screen query.
Cleaned up code to follow tab rules and removed excess commenting out of unused code.