added images, design adjustions, more complex data handling