Reorganised media page and fixed some typos
Merge remote-tracking branch 'upstream/master'
Merge pull request #58 from DeckOfPandas/master

Reorganised media page and fixed some typos