Add id to image so we can always update it
Fix trailing whitespaces and add newlines at the end of files