Media margin fix

looks big but most of the diff is indentation. only change is moving the media margins to include the element above, in order to fix this banding (the dark margin changes shade on the left)

![image](https://cloud.githubusercontent.com/assets/960919/4289410/67151c36-3db3-11e4-92d8-aed06b90bb91.png)