Adding a nice frame and touching up layout on image media content.

And some code cleanup.