Adding images for Elements and Classes + Fixing some bugs