Image references changed and JS fix