improved image page
Merge branch 'develop'