Added missing images and tidied up some code