better comment highlight, image error display
Better layout