Added images, names, and cleaned up a bit