Add image attachment support, update template and js
Update class names