Code clean up and small changes

Converted some images to Sprites, deleted and consolidated some images,
minor fixes.