Added images, cleaned up and organized