Added optional class image and fixed animations