Fixed so that when load a new set the main image is reset, changed tests, fixed photoView to use a lot less when's etc