changed some images and perform some cleanup in code to avoid crash
adjusted images