Added images and improved code structure