Final markup fixes
Image preview