Tighten up markup
Add back image max width and height parameter output