Image and style fixes.
Merge pull request #6 from arthurevans/reorg

Image and style fixes.