display images and acceptable frontend structure
fixed merge conflicts