Topic/media display

Extensive change to the media handling, as per discussion.