Merge pull request #91 from kaernyk/master

Correct catalog display
Improve image handling in catalog to improve consistency