Cleaned up format and fixed image loading for new names.