#4 Naming of images was wrong
#5 Fixed some bugs

Still to do: new screen