Another major cleanup. Fixed images names in certain functions.