Cleaning up, adding images and js